Commit Graph

27388 Commits

Author SHA1 Message Date
Sudheer Shanka
c63fb662f0 Merge "Fix crash in SetupRedactionInterstitial." into nyc-dev am: 31fb2a7a1d
am: 5581312428

* commit '5581312428580ceb4960db5a89e4079480d1349d':
  Fix crash in SetupRedactionInterstitial.

Change-Id: Ie361c236b73c658c6552959bb46f7becbdcd0f57
2016-05-16 20:25:01 +00:00
Julia Reynolds
b05176b02e Merge "Fix crash on rotation." into nyc-dev am: 075690875b
am: 3d18e1991a

* commit '3d18e1991a29b18f84d8859cebf8736d050f8c10':

Change-Id: Idc7092febf05500167c82566a77f01fe6fa2efda
2016-05-16 20:25:00 +00:00
Sudheer Shanka
5581312428 Merge "Fix crash in SetupRedactionInterstitial." into nyc-dev
am: 31fb2a7a1d

* commit '31fb2a7a1d3ee27ad7f47fb26cd5900b033ef24d':
  Fix crash in SetupRedactionInterstitial.

Change-Id: I55d25ec0d3fc06ba099aec098220500ed7c8d61f
2016-05-16 20:22:30 +00:00
Julia Reynolds
1f9ae181b0 Merge "Fix crash on rotation." into nyc-dev am: 075690875b
am: edd4824d44

* commit 'edd4824d44ada4095d8715e26fba08479a6d7219':
  Fix crash on rotation.

Change-Id: I108cd3d51018987f37b6249e53684eb81b4de832
2016-05-16 20:22:30 +00:00
Julia Reynolds
edd4824d44 Merge "Fix crash on rotation." into nyc-dev
am: 075690875b

* commit '075690875b437822d23dc38df5e1c02564a7b83e':
  Fix crash on rotation.

Change-Id: I6bb07ec33e7fa029047d416d758cfa8e6985d3af
2016-05-16 20:19:50 +00:00
Julia Reynolds
3d18e1991a Merge "Fix crash on rotation." into nyc-dev
am: 075690875b

* commit '075690875b437822d23dc38df5e1c02564a7b83e':
  Fix crash on rotation.

Change-Id: I08a281fa426b81ebcf0021b89adbe04379d305ec
2016-05-16 20:19:46 +00:00
TreeHugger Robot
31fb2a7a1d Merge "Fix crash in SetupRedactionInterstitial." into nyc-dev 2016-05-16 20:19:07 +00:00
Julia Reynolds
075690875b Merge "Fix crash on rotation." into nyc-dev 2016-05-16 20:12:06 +00:00
Julia Reynolds
176b28663b Fix crash on rotation.
Change-Id: Ife0a040bfc1a6ecc579d544f78cc45e37f5bca3c
Fixes: 28767083
2016-05-16 15:56:15 -04:00
Sudheer Shanka
dc3ed0a5bf Fix crash in SetupRedactionInterstitial.
Change-Id: Ia662cd60e4c9eeaccd0eb168431e755c2c79b676
Fixes: 28785168
2016-05-16 11:46:34 -07:00
Android Build Merger (Role)
b7656a26dc Merge "Merge "Catch rule creation exceptions." into nyc-dev am: f1c2e62f4e am: 35dc1899a6" into nyc-mr1-dev-plus-aosp 2016-05-16 18:36:55 +00:00
Julia Reynolds
0b1cd5e14c Merge "Catch rule creation exceptions." into nyc-dev am: f1c2e62f4e
am: 35dc1899a6

* commit '35dc1899a6ecd55534135d63a58d19160d86af2a':
  Catch rule creation exceptions.

Change-Id: I7490151940e0476a400cb79adf40054ab35df0ea
2016-05-16 18:35:56 +00:00
Julia Reynolds
c34538754a Merge "Catch rule creation exceptions." into nyc-dev am: f1c2e62f4e
am: 84082aac24

* commit '84082aac240febc46d6db1b94530b047e522b200':
  Catch rule creation exceptions.

Change-Id: I99aeb96b8e8b9494a4e388f53e52bdb90288970d
2016-05-16 18:34:17 +00:00
Julia Reynolds
84082aac24 Merge "Catch rule creation exceptions." into nyc-dev
am: f1c2e62f4e

* commit 'f1c2e62f4ec00205dc1e78ff66e77d8380d9a6f2':
  Catch rule creation exceptions.

Change-Id: I2d5d9e15f0c86b700b8c3a058e3cf92e36591173
2016-05-16 18:29:21 +00:00
Julia Reynolds
35dc1899a6 Merge "Catch rule creation exceptions." into nyc-dev
am: f1c2e62f4e

* commit 'f1c2e62f4ec00205dc1e78ff66e77d8380d9a6f2':
  Catch rule creation exceptions.

Change-Id: Ia0aa67e7aa968b18dc54a4a171780fb283b3bee8
2016-05-16 18:29:16 +00:00
Julia Reynolds
f1c2e62f4e Merge "Catch rule creation exceptions." into nyc-dev 2016-05-16 18:22:15 +00:00
Clara Bayarri
d3e48cd84d Rename requestKeyboardShortcutsHelper am: fcc411c807
am: 0220d40488

* commit '0220d40488b625e45476e035d53770b18a18618d':

Change-Id: I0d9ca1ea03fd447e37bce70f9660f398df57ba15
2016-05-16 15:18:00 +00:00
Clara Bayarri
709ba02218 Rename requestKeyboardShortcutsHelper am: fcc411c807
am: 41db2612ff

* commit '41db2612ff1dc8a2cd3e54142a269e211f2529cc':
  Rename requestKeyboardShortcutsHelper

Change-Id: I90b0e5f7be3825d462b964d14eb0183273d119ef
2016-05-16 15:14:44 +00:00
Clara Bayarri
41db2612ff Rename requestKeyboardShortcutsHelper
am: fcc411c807

* commit 'fcc411c8078e4be5f1f77d7a28b8ce0be20206d5':
  Rename requestKeyboardShortcutsHelper

Change-Id: I807f9d504e2a93b2090f22261c9ff911eb3349cc
2016-05-16 15:09:33 +00:00
Clara Bayarri
0220d40488 Rename requestKeyboardShortcutsHelper
am: fcc411c807

* commit 'fcc411c8078e4be5f1f77d7a28b8ce0be20206d5':
  Rename requestKeyboardShortcutsHelper

Change-Id: I5333409492e2a64d4015c601714e1d0ec041e54f
2016-05-16 15:09:31 +00:00
Julia Reynolds
992422fd5e Catch rule creation exceptions.
Bug: 28775583
Change-Id: I54c4af0352c88b27717660741709ec54e4749656
2016-05-16 09:53:23 -04:00
Clara Bayarri
fcc411c807 Rename requestKeyboardShortcutsHelper
Per API Council feedback

Bug: 28775576
Change-Id: Ia19668dceb7da2222e9716fcb1caff8d0ee86c41
2016-05-16 14:16:46 +01:00
Steven Ng
958d1253c5 Merge "Add a Global setting for disabling OEM unlocking setting" into nyc-mr1-dev
am: 030060a321

* commit '030060a32166990585cf0ef2c007e7f787e5dd7d':
  Add a Global setting for disabling OEM unlocking setting

Change-Id: I8fa26a26e174e0e44875eb925aad9f3978373e04
2016-05-16 09:25:39 +00:00
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