Steven Ng
030060a321
Merge "Add a Global setting for disabling OEM unlocking setting" into nyc-mr1-dev
2016-05-16 09:20:43 +00:00
Daniel Nishi
e592a41727
Merge "Add an Activity to handle Intents to invoke the Deletion Helper." into nyc-mr1-dev
...
am: 03f26d3997
* commit '03f26d39972d4d063096ccbc00ebec53365ce455':
Add an Activity to handle Intents to invoke the Deletion Helper.
Change-Id: I7322ce796fe4910d9904e37d0bf142bbc90b5f47
2016-05-14 01:23:28 +00:00
Daniel Nishi
03f26d3997
Merge "Add an Activity to handle Intents to invoke the Deletion Helper." into nyc-mr1-dev
2016-05-14 01:14:15 +00:00
Daniel Nishi
de98b25c01
Merge "Add downloads to the deletion helper." into nyc-mr1-dev
...
am: 95c3c5045f
* commit '95c3c5045fde4667e8085d69a0aba4b82126d682':
Add downloads to the deletion helper.
Change-Id: I192143eb333d584b4ec792913eda79d9614c6150
2016-05-14 00:12:32 +00:00
Daniel Nishi
95c3c5045f
Merge "Add downloads to the deletion helper." into nyc-mr1-dev
2016-05-14 00:05:01 +00:00
Daniel Nishi
287d91181f
Add an Activity to handle Intents to invoke the Deletion Helper.
...
This will allow apps to launch the deletion helper when they need to
have space freed up.
To launch the activity using an intent, you can set it as follows:
Intent intent = new Intent(Settings.ACTION_DELETION_HELPER_SETTINGS);
startActivity(intent);
This intent should bring up the Deletion Helper.
Bug: 28675265
Change-Id: I781615ccad4ca1fcae97817ecb823e5dcad67b5b
2016-05-13 17:03:30 -07:00
Sudheer Shanka
91140fde74
Merge "Guard against exception when getting package installer info." into nyc-dev am: 15c1bb48c3
...
am: b071fdca57
* commit 'b071fdca574bee356e2c37eb9a093f1b73731df6':
Change-Id: I8b0cbe39b30eead53b93811329de3e01e3866858
2016-05-13 21:37:07 +00:00
Sudheer Shanka
50f9e16450
Merge "Guard against exception when getting package installer info." into nyc-dev am: 15c1bb48c3
...
am: 3ad3bd66ad
* commit '3ad3bd66adb2be016654c8655f8bad4ddc0bcd79':
Guard against exception when getting package installer info.
Change-Id: I2de57942f4e844375e6dfe6f4f0a9489f9d6382b
2016-05-13 21:34:24 +00:00
Sudheer Shanka
b071fdca57
Merge "Guard against exception when getting package installer info." into nyc-dev
...
am: 15c1bb48c3
* commit '15c1bb48c3da3404a775c7101e3559772aa37d6e':
Guard against exception when getting package installer info.
Change-Id: I3cf5a62c44b12356b48f841a03874f93b1c23981
2016-05-13 21:29:02 +00:00
Sudheer Shanka
3ad3bd66ad
Merge "Guard against exception when getting package installer info." into nyc-dev
...
am: 15c1bb48c3
* commit '15c1bb48c3da3404a775c7101e3559772aa37d6e':
Guard against exception when getting package installer info.
Change-Id: Ibe6459ec92ffe90872c3380d865baea6cb257508
2016-05-13 21:29:01 +00:00
TreeHugger Robot
15c1bb48c3
Merge "Guard against exception when getting package installer info." into nyc-dev
2016-05-13 21:18:06 +00:00
Daniel Nishi
2ef20fb36d
Add downloads to the deletion helper.
...
This adds a deletion service to delete files in the Downloads
folder. All of the files there are collected and offered to the
user to delete.
Bug: 28621781
Change-Id: I94431f9abc3a0afa2d07dbab763312c09e830aef
2016-05-13 13:35:37 -07:00
Sudheer Shanka
aed0537aaf
Guard against exception when getting package installer info.
...
Bug: 28742227
Change-Id: I8742c882ae6b18cb8f51a9da04170358a20a7d48
2016-05-13 12:58:42 -07:00
Android Build Merger (Role)
01438a9213
Merge "Merge "ShortcutManager: Remove developer option from NYC" into nyc-dev am: a23cd4614f
am: 446e5a536e" into nyc-mr1-dev-plus-aosp
2016-05-13 19:00:27 +00:00
Makoto Onuki
7d231e354b
Merge "ShortcutManager: Remove developer option from NYC" into nyc-dev am: a23cd4614f
...
am: 446e5a536e
* commit '446e5a536edeef02fa976898b2eca85b22296509':
Change-Id: I448140791a788716893324ebae10adbead984f79
2016-05-13 19:00:20 +00:00
Android Build Merger (Role)
b4e61334ff
Merge "Merge "ShortcutManager: Remove developer option from NYC" into nyc-dev am: a23cd4614f
am: 446e5a536e" into nyc-mr1-dev-plus-aosp
2016-05-13 18:59:43 +00:00
Makoto Onuki
dc3bb2798a
Merge "ShortcutManager: Remove developer option from NYC" into nyc-dev am: a23cd4614f
...
am: f4ffd6daff
* commit 'f4ffd6daff1a626d196e30cdebcbf913f936714e':
ShortcutManager: Remove developer option from NYC
Change-Id: I7689577ee57a58d1abdb4690c453f6a9cadfa251
2016-05-13 18:59:31 +00:00
Makoto Onuki
feea1622af
Merge "ShortcutManager: Remove developer option from NYC" into nyc-dev am: a23cd4614f
...
am: 446e5a536e
* commit '446e5a536edeef02fa976898b2eca85b22296509':
ShortcutManager: Remove developer option from NYC
Change-Id: Iecf0fdd286c2154844075b01dbc622ae52fe7c6e
2016-05-13 18:59:30 +00:00
Makoto Onuki
f4ffd6daff
Merge "ShortcutManager: Remove developer option from NYC" into nyc-dev
...
am: a23cd4614f
* commit 'a23cd4614f0341051e85c3dbdb7766d09c089947':
ShortcutManager: Remove developer option from NYC
Change-Id: Ie49323be5bb7f8b5e258ecb40382463e3cbb847b
2016-05-13 18:57:00 +00:00
Makoto Onuki
446e5a536e
Merge "ShortcutManager: Remove developer option from NYC" into nyc-dev
...
am: a23cd4614f
* commit 'a23cd4614f0341051e85c3dbdb7766d09c089947':
ShortcutManager: Remove developer option from NYC
Change-Id: Icd507fcaba578122e50f4fc86e53bd65b4cac1fb
2016-05-13 18:57:00 +00:00
Makoto Onuki
a23cd4614f
Merge "ShortcutManager: Remove developer option from NYC" into nyc-dev
2016-05-13 18:51:41 +00:00
Julia Reynolds
1c59860a81
Merge "Don\'t crash on invalid numbers." into nyc-dev am: 5c401966a3
...
am: 6c12a6723c
* commit '6c12a6723c5de959dacb409288d20ba4f8ed9893':
Change-Id: I2217b28cb6572a37745043f50e95024dd93f1adb
2016-05-13 18:25:04 +00:00
Julia Reynolds
d7a6287f9e
Merge "Don\'t crash on invalid numbers." into nyc-dev am: 5c401966a3
...
am: 54408a74fa
* commit '54408a74fa7988a66dc5f68704a2751c23485c0e':
Don't crash on invalid numbers.
Change-Id: Idbcf00b60beaf13d5d023832ea9a6c9c0a9debbe
2016-05-13 18:24:22 +00:00
Daniel Nishi
e197dfa1fc
Merge "Entries in the Deletion Helper should be default unchecked." into nyc-mr1-dev
...
am: 4924839515
* commit '4924839515811deaff1b0a758101f4db47a77683':
Entries in the Deletion Helper should be default unchecked.
Change-Id: Iaa1bb02433378e3ad9ec0b1029566fc113d8fb14
2016-05-13 18:24:21 +00:00
Julia Reynolds
6c12a6723c
Merge "Don\'t crash on invalid numbers." into nyc-dev
...
am: 5c401966a3
* commit '5c401966a3106a223eadabb1fbb156160fdd5222':
Don't crash on invalid numbers.
Change-Id: If4ce5adec9f3297cf45d8a4f3378ed89c8518bef
2016-05-13 18:22:25 +00:00
Julia Reynolds
54408a74fa
Merge "Don\'t crash on invalid numbers." into nyc-dev
...
am: 5c401966a3
* commit '5c401966a3106a223eadabb1fbb156160fdd5222':
Don't crash on invalid numbers.
Change-Id: Ia622b5a3cb31a6ad0a9aebdb1a3cff28c6d4eb04
2016-05-13 18:22:18 +00:00
Daniel Nishi
4924839515
Merge "Entries in the Deletion Helper should be default unchecked." into nyc-mr1-dev
2016-05-13 18:15:28 +00:00
Julia Reynolds
5c401966a3
Merge "Don't crash on invalid numbers." into nyc-dev
2016-05-13 18:14:59 +00:00
Julia Reynolds
b9cad485af
Don't crash on invalid numbers.
...
Change-Id: I5c1bff5733c5db5f411c2827177b0c1efa1e120e
Fixes: 28756890
2016-05-13 14:01:40 -04:00
Android Build Merger (Role)
1e1a082e73
Merge "Merge "Fixed calls to update() when configuration changed." into nyc-dev am: f4f2211b13
am: 312ecda0ec" into nyc-mr1-dev-plus-aosp
2016-05-13 17:47:25 +00:00
Felipe Leme
c9c30d97ee
Merge "Fixed calls to update() when configuration changed." into nyc-dev am: f4f2211b13
...
am: 312ecda0ec
* commit '312ecda0ec986635cd88eeec6cc4c5e231ed3d70':
Fixed calls to update() when configuration changed.
Change-Id: I1d9dae63d0d8a43386c5104f0f7e964c107d3996
2016-05-13 17:47:17 +00:00
Felipe Leme
7e8863479e
Merge "Fixed calls to update() when configuration changed." into nyc-dev am: f4f2211b13
...
am: 23c69bb59f
* commit '23c69bb59fa0eb76d9c5e0b6cfeb0af066b4c42d':
Fixed calls to update() when configuration changed.
Change-Id: I525d4a70ff91c28809ecb01e184587d889060df9
2016-05-13 17:47:12 +00:00
Felipe Leme
312ecda0ec
Merge "Fixed calls to update() when configuration changed." into nyc-dev
...
am: f4f2211b13
* commit 'f4f2211b1364422abec41e056af77c03247c3f4e':
Fixed calls to update() when configuration changed.
Change-Id: I0192f6a8e94996adbe458f523b0b004b73aa955f
2016-05-13 17:44:45 +00:00
Felipe Leme
23c69bb59f
Merge "Fixed calls to update() when configuration changed." into nyc-dev
...
am: f4f2211b13
* commit 'f4f2211b1364422abec41e056af77c03247c3f4e':
Fixed calls to update() when configuration changed.
Change-Id: Ia35d89560fe2dd51d1c0dc8da3d1209c2cb03622
2016-05-13 17:44:41 +00:00
TreeHugger Robot
f4f2211b13
Merge "Fixed calls to update() when configuration changed." into nyc-dev
2016-05-13 17:35:20 +00:00
Felipe Leme
1848956500
Merge "Removed onRestrictPowerChanged()." into nyc-dev am: 85f4269c9f
...
am: 828852a7cc
* commit '828852a7cc5407141c6aa866228267d6932f6a7a':
Change-Id: I941f72d668a5bd5ab712472887a4b4ef89136d16
2016-05-13 17:31:15 +00:00
Felipe Leme
cfe2bfd8b4
Merge "Removed onRestrictPowerChanged()." into nyc-dev am: 85f4269c9f
...
am: 7fe77ae5db
* commit '7fe77ae5db69a5ed6e50faa7fd345d4e29ff807a':
Removed onRestrictPowerChanged().
Change-Id: I6619f264a5ce8692bab48b2e6af64b534d88b238
2016-05-13 17:28:43 +00:00
Felipe Leme
828852a7cc
Merge "Removed onRestrictPowerChanged()." into nyc-dev
...
am: 85f4269c9f
* commit '85f4269c9f3c79f19b2263fc15d2404bde0e1f0e':
Removed onRestrictPowerChanged().
Change-Id: If0c2f4eb4db3107aeabecb236b5aec93f252f57e
2016-05-13 17:25:34 +00:00
Felipe Leme
7fe77ae5db
Merge "Removed onRestrictPowerChanged()." into nyc-dev
...
am: 85f4269c9f
* commit '85f4269c9f3c79f19b2263fc15d2404bde0e1f0e':
Removed onRestrictPowerChanged().
Change-Id: Ie44a6664f2fb91a7556d4d8700ce18da8e6512f3
2016-05-13 17:25:33 +00:00
TreeHugger Robot
85f4269c9f
Merge "Removed onRestrictPowerChanged()." into nyc-dev
2016-05-13 17:14:12 +00:00
Yifan Bai
038fe280c4
Merge "Fix cannot build prefer or restore APN for Secondary SIM/Sub." am: 5620699fb9
am: 1545987bec
...
am: 68026dbac5
* commit '68026dbac56aa837ffd2fead4a2a59440ee3729c':
Fix cannot build prefer or restore APN for Secondary SIM/Sub.
Change-Id: I3f60ca9fc7d70e6fbc383a18f3238ed341beb968
2016-05-13 16:57:19 +00:00
Amit Mahajan
68026dbac5
Merge "Fix cannot build prefer or restore APN for Secondary SIM/Sub." am: 5620699fb9
...
am: 1545987bec
* commit '1545987bec5f2f8c5b98c1cfbba610ece2d537b0':
Fix cannot build prefer or restore APN for Secondary SIM/Sub.
Change-Id: I739817ba6a0adfdd1b8edf9d04ee135346f1283a
2016-05-13 16:54:49 +00:00
Yifan Bai
1545987bec
Merge "Fix cannot build prefer or restore APN for Secondary SIM/Sub."
...
am: 5620699fb9
* commit '5620699fb99cd4f56c9956e6a2cab99bab0126f8':
Fix cannot build prefer or restore APN for Secondary SIM/Sub.
Change-Id: Ib5c1c6deb878d91f684c4cd8ff4151d8dbb562a5
2016-05-13 16:52:14 +00:00
Amit Mahajan
5620699fb9
Merge "Fix cannot build prefer or restore APN for Secondary SIM/Sub."
2016-05-13 16:45:26 +00:00
Makoto Onuki
d819814c63
ShortcutManager: Remove developer option from NYC
...
Bug 28704708
Change-Id: Ib2301ea556104e9ffd6a18885e228717843d6acb
2016-05-13 09:40:26 -07:00
Android Build Merger (Role)
11d550647e
Merge "Merge "Fix NULL instead of DPC name is displayed in Certificate warning" into nyc-dev am: 19c7ef11bd
am: 6b5c77a752" into nyc-mr1-dev-plus-aosp
2016-05-13 15:15:30 +00:00
Victor Chang
1eb6b46304
Merge "Fix NULL instead of DPC name is displayed in Certificate warning" into nyc-dev am: 19c7ef11bd
...
am: 2c41dea8b3
* commit '2c41dea8b37a0289c3f07fbf7cbd5e682523b7a3':
Fix NULL instead of DPC name is displayed in Certificate warning
Change-Id: I1e119d62cd1369cdd6365c9b3e06d299f30299e8
2016-05-13 15:15:16 +00:00
Victor Chang
de28ad5109
Merge "Fix NULL instead of DPC name is displayed in Certificate warning" into nyc-dev am: 19c7ef11bd
...
am: 6b5c77a752
* commit '6b5c77a7527785418321539db1c294482910ef90':
Fix NULL instead of DPC name is displayed in Certificate warning
Change-Id: I949f43532944af2b417d7949031df484e25ac807
2016-05-13 15:15:16 +00:00
Victor Chang
2c41dea8b3
Merge "Fix NULL instead of DPC name is displayed in Certificate warning" into nyc-dev
...
am: 19c7ef11bd
* commit '19c7ef11bdc649b3619f421946225d8953218fd1':
Fix NULL instead of DPC name is displayed in Certificate warning
Change-Id: I3394d9eb0808f795b8dcce03578a0631731b2bee
2016-05-13 15:12:50 +00:00
Victor Chang
6b5c77a752
Merge "Fix NULL instead of DPC name is displayed in Certificate warning" into nyc-dev
...
am: 19c7ef11bd
* commit '19c7ef11bdc649b3619f421946225d8953218fd1':
Fix NULL instead of DPC name is displayed in Certificate warning
Change-Id: I85bb03da5e85fb401e672783295e5f545dbd10ab
2016-05-13 15:12:49 +00:00