Commit Graph

28464 Commits

Author SHA1 Message Date
Jason Monk
49e43a2503 Merge "Merge "Don\'t crash on Settings data usage" into nyc-dev am: b60c7560af am: fc63188c2c" into nyc-mr1-dev-plus-aosp
am: b5cbaa27f7

* commit 'b5cbaa27f7bca6321760e757c8cb3135e1518446':

Change-Id: Iccb72b39c82b583feb7bd97b9801b48a1ad6925a
2016-04-29 19:03:16 +00:00
Jason Monk
334de02262 Merge "Don\'t crash on Settings data usage" into nyc-dev am: b60c7560af am: 4b32f9f5ad
am: e8b198b606

* commit 'e8b198b606e318b2f9f3f98b7225299e53e28645':
  Don't crash on Settings data usage

Change-Id: I9aa40cdc9af7d65f8e02bb18be4464bb553a4c49
2016-04-29 19:03:15 +00:00
Android Build Merger (Role)
b5cbaa27f7 Merge "Merge "Don\'t crash on Settings data usage" into nyc-dev am: b60c7560af am: fc63188c2c" into nyc-mr1-dev-plus-aosp 2016-04-29 19:01:10 +00:00
Jason Monk
561ec05025 Merge "Don\'t crash on Settings data usage" into nyc-dev am: b60c7560af
am: fc63188c2c

* commit 'fc63188c2cbb6fbda340c9f8c9c7b4541b160912':
  Don't crash on Settings data usage

Change-Id: Iada79f9953fea61a164ddac887dff6aafce14553
2016-04-29 19:01:01 +00:00
Jason Monk
e8b198b606 Merge "Don\'t crash on Settings data usage" into nyc-dev am: b60c7560af
am: 4b32f9f5ad

* commit '4b32f9f5ada3f3eec32409c8188bb15e39bdea4b':
  Don't crash on Settings data usage

Change-Id: I9f345c6c8fd278c15ca1eb8453581cee6e553323
2016-04-29 19:01:00 +00:00
Jason Monk
fc63188c2c Merge "Don\'t crash on Settings data usage" into nyc-dev
am: b60c7560af

* commit 'b60c7560afe6c4326d9e77423b31e0dcbf452506':
  Don't crash on Settings data usage

Change-Id: I6227d2797bdbe49758885a4c48f20e6013f30be7
2016-04-29 18:58:41 +00:00
Jason Monk
4b32f9f5ad Merge "Don\'t crash on Settings data usage" into nyc-dev
am: b60c7560af

* commit 'b60c7560afe6c4326d9e77423b31e0dcbf452506':
  Don't crash on Settings data usage

Change-Id: I0659dc194c2fb16dda9771e9a5a7b1d3375887b4
2016-04-29 18:58:41 +00:00
Jason Monk
b60c7560af Merge "Don't crash on Settings data usage" into nyc-dev 2016-04-29 18:54:08 +00:00
Fan Zhang
dc5088bb9d Merge "Disable stable id in support adapter." into nyc-mr1-dev am: 7efc40797a
am: bbe5bbb453

* commit 'bbe5bbb453fb5a2b297c46edd7c0461e6d2c5f6d':
  Disable stable id in support adapter.

Change-Id: I09d945cb62c273e64ae8c23bc4edcdb1228f1b8b
2016-04-29 18:31:46 +00:00
Fan Zhang
bbe5bbb453 Merge "Disable stable id in support adapter." into nyc-mr1-dev
am: 7efc40797a

* commit '7efc40797af03adc9b56e9f87acba4fa4d659940':
  Disable stable id in support adapter.

Change-Id: Ic7cb02dd709876b88e602aa0b37aaa5e8e0898e8
2016-04-29 18:29:30 +00:00
Fan Zhang
7efc40797a Merge "Disable stable id in support adapter." into nyc-mr1-dev 2016-04-29 18:20:51 +00:00
Jason Monk
bc4e200a59 Don't crash on Settings data usage
Consider Settings uid (SYSTEM_UID) to be an app.

Change-Id: Ia5cc7897eafdf3d654e8a23715bd25502097bab8
Fixes: 28193076
2016-04-29 14:06:10 -04:00
Jason Monk
33e5faf426 Merge "Merge "Don\'t crash settings when out of space." into nyc-dev am: a1fe122b99 am: cf5a448ce5" into nyc-mr1-dev-plus-aosp
am: 0044da3ede

* commit '0044da3edec38f3482bea5d59e051ff9bcd6aeb1':

Change-Id: I30bac4c6654e1a2ae21d3a5daa76b2af1a6f2588
2016-04-29 18:02:15 +00:00
Jason Monk
e58559e3ca Merge "Don\'t crash settings when out of space." into nyc-dev am: a1fe122b99 am: cd5d6137bc
am: 1b997d2cd9

* commit '1b997d2cd966c7e7c73a37bc8343f60755dc30b2':
  Don't crash settings when out of space.

Change-Id: I4ed32a93c8d53e283af7c4884d2aae3876727801
2016-04-29 18:02:15 +00:00
Android Build Merger (Role)
0044da3ede Merge "Merge "Don\'t crash settings when out of space." into nyc-dev am: a1fe122b99 am: cf5a448ce5" into nyc-mr1-dev-plus-aosp 2016-04-29 17:59:53 +00:00
Jason Monk
c6c8860220 Merge "Don\'t crash settings when out of space." into nyc-dev am: a1fe122b99
am: cf5a448ce5

* commit 'cf5a448ce57883088fa7f6b3d6683065e266470f':
  Don't crash settings when out of space.

Change-Id: I3772a8b5210130f3cfbf4c7b6fe5d487eb9ace53
2016-04-29 17:59:47 +00:00
Jason Monk
1b997d2cd9 Merge "Don\'t crash settings when out of space." into nyc-dev am: a1fe122b99
am: cd5d6137bc

* commit 'cd5d6137bc893f21928f6e77c70963780fc6e159':
  Don't crash settings when out of space.

Change-Id: I04e91645bb1e35b28ab1900d1f172d0633e2dc11
2016-04-29 17:59:36 +00:00
Jason Monk
cf5a448ce5 Merge "Don\'t crash settings when out of space." into nyc-dev
am: a1fe122b99

* commit 'a1fe122b99a89e13ef3e06364df519ca93a35dcc':
  Don't crash settings when out of space.

Change-Id: Id336b4dcf1ab7fce3581286d598cf590c4973548
2016-04-29 17:57:27 +00:00
Jason Monk
cd5d6137bc Merge "Don\'t crash settings when out of space." into nyc-dev
am: a1fe122b99

* commit 'a1fe122b99a89e13ef3e06364df519ca93a35dcc':
  Don't crash settings when out of space.

Change-Id: Ie1095da87343cc74d65bbcf255d5692197a7a241
2016-04-29 17:57:24 +00:00
Mihai Niță
ba45bc8cdb Merge "Merge "Fix: accessibility actions move languages but don\'t update" into nyc-dev am: 7dce005fab am: f02a31beaa" into nyc-mr1-dev-plus-aosp
am: 78127f0e01

* commit '78127f0e01351b0cf9a59f6725b04ba80c11b274':

Change-Id: I6d934601a5ea21736157317d917c402787176853
2016-04-29 17:55:10 +00:00
Mihai Niță
a60a07fc3a Merge "Merge "Fix: accessibility actions move languages but don\'t update" into nyc-dev am: 7dce005fab am: f02a31beaa" into nyc-mr1-dev-plus-aosp
am: 0d342e624d

* commit '0d342e624d1525aad7938636d3a4950e73a1f55f':

Change-Id: I86cc3838071e559e5191903a43d3e75852ddf8b0
2016-04-29 17:55:09 +00:00
Mihai Nita
1a3818b686 Merge "Fix: accessibility actions move languages but don\'t update" into nyc-dev am: 7dce005fab am: 48db95270e
am: 7d5bc8f454

* commit '7d5bc8f4544b6b49765b87d875ced3ea7d58f430':
  Fix: accessibility actions move languages but don't update

Change-Id: I0a0bdadc04321bc28a3ce702063f9b631daf647d
2016-04-29 17:55:09 +00:00
Jason Monk
a1fe122b99 Merge "Don't crash settings when out of space." into nyc-dev 2016-04-29 17:54:34 +00:00
Android Build Merger (Role)
78127f0e01 Merge "Merge "Fix: accessibility actions move languages but don\'t update" into nyc-dev am: 7dce005fab am: f02a31beaa" into nyc-mr1-dev-plus-aosp 2016-04-29 17:53:44 +00:00
Mihai Niță
bd377388c5 Merge "Fix: accessibility actions move languages but don\'t update" into nyc-dev am: 7dce005fab
am: f02a31beaa

* commit 'f02a31beaab1da23537073c8f376b9daec7b2215':

Change-Id: Ia1ee12e5410a835a3c6382208dd3a79a8aa37d3d
2016-04-29 17:53:38 +00:00
Android Build Merger (Role)
0d342e624d Merge "Merge "Fix: accessibility actions move languages but don\'t update" into nyc-dev am: 7dce005fab am: f02a31beaa" into nyc-mr1-dev-plus-aosp 2016-04-29 17:53:02 +00:00
Mihai Niță
3f6ad0ee07 Merge "Fix: accessibility actions move languages but don\'t update" into nyc-dev am: 7dce005fab
am: f02a31beaa

* commit 'f02a31beaab1da23537073c8f376b9daec7b2215':
  Fix: accessibility actions move languages but don't update

Change-Id: Ibbbcf694cb80a9ec586bce48a5cab07c98e7c38f
2016-04-29 17:52:51 +00:00
Mihai Niță
7d5bc8f454 Merge "Fix: accessibility actions move languages but don\'t update" into nyc-dev am: 7dce005fab
am: 48db95270e

* commit '48db95270ec9a85edd15b1df1085aad0020851ba':
  Fix: accessibility actions move languages but don't update

Change-Id: I99157a90add1fb4bdaa513a6b479d2c7d1634fde
2016-04-29 17:52:50 +00:00
Jason Monk
ef71f605f3 Don't crash settings when out of space.
Change-Id: I2e36fe845601558d789f38ae9f70d1a1684d8fd4
Fixes: 28198128
2016-04-29 13:51:08 -04:00
Mihai Nita
f02a31beaa Merge "Fix: accessibility actions move languages but don\'t update" into nyc-dev
am: 7dce005fab

* commit '7dce005fabf15c3532db0540cdc2c67e59da7fb4':
  Fix: accessibility actions move languages but don't update

Change-Id: Ie565b3a9d7d7caa00d8be389774b397339fec1b9
2016-04-29 17:50:39 +00:00
Mihai Nita
48db95270e Merge "Fix: accessibility actions move languages but don\'t update" into nyc-dev
am: 7dce005fab

* commit '7dce005fabf15c3532db0540cdc2c67e59da7fb4':
  Fix: accessibility actions move languages but don't update

Change-Id: Ia6218cfbd9d2b0d29e36def684f5909932980481
2016-04-29 17:50:39 +00:00
Mihai Niță
7dce005fab Merge "Fix: accessibility actions move languages but don't update" into nyc-dev 2016-04-29 17:46:16 +00:00
Clara Bayarri
5a0d9ecc7b Merge "Merge "Remove Secure Startup option from Security Settings" into nyc-dev am: 35bf932eb0 am: 99e5285425" into nyc-mr1-dev-plus-aosp
am: 23456e3844

* commit '23456e3844e2b54c5003b777b34ed5d8806eea1b':

Change-Id: Ida6baacccfdcc11b5a9316ca8b7a20526bd88c60
2016-04-29 17:43:43 +00:00
Clara Bayarri
c1367a7c2d Merge "Merge "Remove Secure Startup option from Security Settings" into nyc-dev am: 35bf932eb0 am: 99e5285425" into nyc-mr1-dev-plus-aosp
am: 663353e71b

* commit '663353e71b52f0e3b8e53043a4ae2a07b0e38df5':

Change-Id: I80757e298cce057ca12584e19b49c5b4a9bcf8b7
2016-04-29 17:43:42 +00:00
Clara Bayarri
c970be3876 Merge "Remove Secure Startup option from Security Settings" into nyc-dev am: 35bf932eb0 am: 1159a0a79c
am: 2e8d2fabfc

* commit '2e8d2fabfcb815a2199195dd1a7669b59338fdf4':
  Remove Secure Startup option from Security Settings

Change-Id: I32d3c509f0b7ba03acc8f933d2840bb92c293872
2016-04-29 17:43:41 +00:00
Android Build Merger (Role)
23456e3844 Merge "Merge "Remove Secure Startup option from Security Settings" into nyc-dev am: 35bf932eb0 am: 99e5285425" into nyc-mr1-dev-plus-aosp 2016-04-29 17:42:08 +00:00
Clara Bayarri
e21fd581c0 Merge "Remove Secure Startup option from Security Settings" into nyc-dev am: 35bf932eb0
am: 99e5285425

* commit '99e5285425962f61d7b17dbb0f01471e3a8f2932':

Change-Id: Id0f502c4093c7d48f4ec41c75e070c64df791298
2016-04-29 17:42:01 +00:00
Android Build Merger (Role)
663353e71b Merge "Merge "Remove Secure Startup option from Security Settings" into nyc-dev am: 35bf932eb0 am: 99e5285425" into nyc-mr1-dev-plus-aosp 2016-04-29 17:41:24 +00:00
Clara Bayarri
504673591f Merge "Remove Secure Startup option from Security Settings" into nyc-dev am: 35bf932eb0
am: 99e5285425

* commit '99e5285425962f61d7b17dbb0f01471e3a8f2932':
  Remove Secure Startup option from Security Settings

Change-Id: I68b498dba4eb5ea66768c07653aa9e2993940dcb
2016-04-29 17:41:17 +00:00
Clara Bayarri
2e8d2fabfc Merge "Remove Secure Startup option from Security Settings" into nyc-dev am: 35bf932eb0
am: 1159a0a79c

* commit '1159a0a79cdf9fcbbae574198ae5ba192ef84aca':
  Remove Secure Startup option from Security Settings

Change-Id: I2721e0e9e2d5920e54b549124664a303a591ae54
2016-04-29 17:41:14 +00:00
Clara Bayarri
99e5285425 Merge "Remove Secure Startup option from Security Settings" into nyc-dev
am: 35bf932eb0

* commit '35bf932eb0daf8038cc917508839784953c45c72':
  Remove Secure Startup option from Security Settings

Change-Id: Ife90c8effce61106a438ccd9158a001792810ede
2016-04-29 17:39:05 +00:00
Clara Bayarri
1159a0a79c Merge "Remove Secure Startup option from Security Settings" into nyc-dev
am: 35bf932eb0

* commit '35bf932eb0daf8038cc917508839784953c45c72':
  Remove Secure Startup option from Security Settings

Change-Id: Id555f9a2abadf9a941e5e63e60ea55c5ce7179bd
2016-04-29 17:38:56 +00:00
Clara Bayarri
35bf932eb0 Merge "Remove Secure Startup option from Security Settings" into nyc-dev 2016-04-29 17:28:42 +00:00
Fan Zhang
ce0c6dd680 Disable stable id in support adapter.
Bug: 28141203
Change-Id: I8785b804e15e58b4885645bc72d68c2a3cacc692
2016-04-29 10:23:21 -07:00
Clara Bayarri
79a6c4ada3 Merge "Storage Settings shows hamburger instead of back arrow" into nyc-dev am: d2549ce663 am: 0a84fd121d
am: a4a7cb0515

* commit 'a4a7cb0515319822fd1953cd1e06e677b71ec4d6':

Change-Id: I61d492b03fd263f9ded0d2a08b3357507235979e
2016-04-29 16:52:09 +00:00
Clara Bayarri
a8d92b59be Merge "Storage Settings shows hamburger instead of back arrow" into nyc-dev am: d2549ce663 am: 55fc7dd52b
am: c0249cbabe

* commit 'c0249cbabe4b709683be8e832c404acbf82b1cb0':
  Storage Settings shows hamburger instead of back arrow

Change-Id: Id5491136bd8d5dfb2e8ebf7c13d04efc021372b8
2016-04-29 16:52:08 +00:00
Clara Bayarri
a4a7cb0515 Merge "Storage Settings shows hamburger instead of back arrow" into nyc-dev am: d2549ce663
am: 0a84fd121d

* commit '0a84fd121d8bf2c1301f4d4eb6465212f1172094':

Change-Id: I4645e0dbad308748f873bc38103996e655c5efb8
2016-04-29 16:51:25 +00:00
Clara Bayarri
c0249cbabe Merge "Storage Settings shows hamburger instead of back arrow" into nyc-dev am: d2549ce663
am: 55fc7dd52b

* commit '55fc7dd52b5eb6a736c8a48fc5cddbb343c02a16':
  Storage Settings shows hamburger instead of back arrow

Change-Id: Id4fa67b14edaaefd698f9ab0522ff271fc42b345
2016-04-29 16:49:04 +00:00
Clara Bayarri
55fc7dd52b Merge "Storage Settings shows hamburger instead of back arrow" into nyc-dev
am: d2549ce663

* commit 'd2549ce6635943144bde17582b825113c07aa868':
  Storage Settings shows hamburger instead of back arrow

Change-Id: Icc2014157f5160968563fdbaab175cbd90a76d58
2016-04-29 16:46:28 +00:00
Clara Bayarri
0a84fd121d Merge "Storage Settings shows hamburger instead of back arrow" into nyc-dev
am: d2549ce663

* commit 'd2549ce6635943144bde17582b825113c07aa868':
  Storage Settings shows hamburger instead of back arrow

Change-Id: I178049719bc00f5baddce247c257004ec41fcbbe
2016-04-29 16:46:27 +00:00