OSDN Git Service
Salvador Martinez [Thu, 4 Aug 2016 20:37:52 +0000 (13:37 -0700)]
Added error handling to settings suggestions list
The suggestions list in the summary page of the
settings app could sometimes cause a crash due to
an uncaught exception. Tis fixed now.
Bug:
30656840
Change-Id: If79f53e6a8c17a81653228d613797e94c473d410
Tony Mantler [Mon, 1 Aug 2016 18:13:04 +0000 (18:13 +0000)]
Merge "Fix strings for translation"
Greg Kaiser [Mon, 1 Aug 2016 17:38:05 +0000 (17:38 +0000)]
Merge "accessorytest: Remove bad code"
Kevin Hufnagle [Sun, 31 Jul 2016 03:49:07 +0000 (03:49 +0000)]
docs: Improved Google Play Developer Console documentation am:
ec8b21a27a am:
e37a55b840 am:
941cf16f34 am:
14cd0becc0
am:
8d01723e8d
Change-Id: If97dde74b3279b42b6c5cd25d9749b7bc64b3aa7
Sudheer Shanka [Sun, 31 Jul 2016 03:49:03 +0000 (03:49 +0000)]
Merge \\\\"Allow apps with CREATE_USERS permission to call UM.getProfiles.\\\\" into nyc-dev am:
b7c3ae1a86 am:
61a2e48e15 am:
3b8a363d0d
am:
c0a65f65fa
Change-Id: I24e2466fcc81fe35fdb2c8f0deebe25e1340a363
Sudheer Shanka [Sun, 31 Jul 2016 03:49:00 +0000 (03:49 +0000)]
Allow apps with CREATE_USERS permission to call UM.getProfiles. am:
7468091329 am:
3e2e8962b1 am:
dfa5addbda
am:
73af7bc25e
Change-Id: Iaf5970f6b4a2b5a9d238099ff0ac004acfb40c95
Jack Yu [Sun, 31 Jul 2016 03:48:57 +0000 (03:48 +0000)]
Merge \\\"Added todo items for a potential metrics issue\\\" into nyc-mr1-dev am:
a4e616e0dc am:
bbdd486b3c
am:
7dd11177bb
Change-Id: I60f4f99b718c6c301a7034ca1db069ad07a890ca
Jack Yu [Sun, 31 Jul 2016 03:48:25 +0000 (03:48 +0000)]
Added todo items for a potential metrics issue am:
dc5a63bdd1 am:
94f2fe22b4
am:
c92cb8b816
Change-Id: Iad996bf83a9d1766f4b5dcb90d71f20488491aac
Dianne Hackborn [Sun, 31 Jul 2016 03:46:10 +0000 (03:46 +0000)]
Merge \\\"Work on issue #
30407061: OverflowArrayMap.stopObject unable to find object\\\" into nyc-mr1-dev am:
29cc1b6939 am:
ed7bd6c339
am:
dd3d5736ae
Change-Id: Ie17541102e75d54b562c80dd7af136ab1c002e38
Dianne Hackborn [Sun, 31 Jul 2016 03:46:08 +0000 (03:46 +0000)]
Work on issue #
30407061: OverflowArrayMap.stopObject unable to find object am:
657153bd28 am:
ae7bdd8dde
am:
347c006732
Change-Id: Ib69b728931b30b2092becb89d55a46b92245a0fc
Dongwon Kang [Sun, 31 Jul 2016 03:46:04 +0000 (03:46 +0000)]
Merge \\\"MediaSession: Allow all profiles to handle work profile case.\\\" into nyc-mr1-dev am:
ce21ca0fd2 am:
4be4068d0c
am:
87bc1acd8f
Change-Id: I7b9d5dc9f07fb624b74a25ff37464ee0cad67551
Dongwon Kang [Sun, 31 Jul 2016 03:46:00 +0000 (03:46 +0000)]
MediaSession: Allow all profiles to handle work profile case. am:
8cf39c5d79 am:
73c1620dee
am:
6014ee1a44
Change-Id: Iecc3bc6354063d4b4898f6205a3542c7dc8344eb
Robert Greenwalt [Sun, 31 Jul 2016 03:45:56 +0000 (03:45 +0000)]
Merge \\\"Stop exposing LTE_CA as a rat type.\\\" into nyc-mr1-dev am:
54be7c295b am:
ee48ed3190
am:
8ffea9dac8
Change-Id: Id1653d28744bff3335eadcad51736e28e894bf99
Robert Greenwalt [Sun, 31 Jul 2016 03:43:31 +0000 (03:43 +0000)]
resolve merge conflicts of
20a35b6 to nyc-mr1-dev-plus-aosp
am:
1398e8e5aa
Change-Id: I187acf0aa781dcb88248e52361bcd097ced92312
Sungsoo Lim [Sun, 31 Jul 2016 03:43:27 +0000 (03:43 +0000)]
Merge \\\\\\\\\\\"DO NOT MERGE: Fix CTS regression\\\\\\\\\\\" into lmp-dev am:
124cc534f8 -s ours am:
3d58e326d9 am:
8ef8e2b648 am:
ec986ac944 -s ours am:
cc154342aa am:
ee0c3b013a am:
0d05028ba8 am:
2f7756f4c9 -s ours am:
ea7fa85a0d am:
c4cabe1896
am:
1e405a416d -s ours
Change-Id: If29f4bb8aa13d5a6023db1b62eee74c93ddb56c5
Sungsoo Lim [Sun, 31 Jul 2016 03:43:25 +0000 (03:43 +0000)]
DO NOT MERGE: Fix CTS regression am:
edc9238514 -s ours am:
0fb1075d95 am:
f928b8062c am:
1fcc472b3e -s ours am:
1559998d08 am:
c3485668ad am:
174f17bc19 am:
cf94d53469 -s ours am:
accabefc6b am:
43e26c9f17
am:
f288a5c9dd -s ours
Change-Id: I738c08b71bcb8aa1ff3d053840bc014e480fe41b
Sudheer Shanka [Sun, 31 Jul 2016 03:43:22 +0000 (03:43 +0000)]
Merge \\\\\\\\\\"DO NOT MERGE: Allow apps with CREATE_USERS permission to call UM.getProfiles.\\\\\\\\\\" into lmp-mr1-dev am:
dbbdb6d089 am:
9ed6bd83ff am:
28acd0fae9 -s ours am:
98ae56902e am:
382f9aadcd am:
9457779aa4 am:
247edeb721 -s ours am:
3cfa1bb8ec am:
68887cf986
am:
1285e2e43e -s ours
Change-Id: Ib530044db1a97717a81fdb1c1824920e62df1645
Sudheer Shanka [Sun, 31 Jul 2016 03:43:19 +0000 (03:43 +0000)]
DO NOT MERGE: Allow apps with CREATE_USERS permission to call UM.getProfiles. am:
7ef684713e am:
9f6bd40108 am:
f01ee1c291 -s ours am:
373492b076 am:
c2178ed1d9 am:
32f4f1a697 am:
5b420a7b44 -s ours am:
efe9502301 am:
c62c942adb
am:
8ea4f6c268 -s ours
Change-Id: Ifbc21dfb44cf69b47a413fb55b3fb1e799aa5ce4
Sudheer Shanka [Sun, 31 Jul 2016 03:21:03 +0000 (03:21 +0000)]
Merge \\\\\\\"DO NOT MERGE: Allow apps with CREATE_USERS permission to call UM.getProfiles.\\\\\\\" into mnc-dev am:
e140322bde am:
088e081ac1 am:
72f9d1ff97 am:
9a7c067034 -s ours am:
ea60ad5173 am:
d9e9cf0ab1
am:
3a8cd004c9 -s ours
Change-Id: I575752973702efde95c66146f6d170b834fba8ea
Sudheer Shanka [Sun, 31 Jul 2016 03:20:51 +0000 (03:20 +0000)]
DO NOT MERGE: Allow apps with CREATE_USERS permission to call UM.getProfiles. am:
8a8d7e7962 am:
2349d0dea5 am:
7559673a6d am:
77f0b54c0b -s ours am:
a8ff98fbce am:
6c43ea3376
am:
3925650b39 -s ours
Change-Id: Idac576d98b79ba10f05e50227302cb7dc8544968
Jeff Sharkey [Sun, 31 Jul 2016 03:20:48 +0000 (03:20 +0000)]
Merge \"String tweak \\\"upgrading\\\" to \\\"finishing\\\". am:
a4600cc6d0 am:
22f7d91489\" into nyc-mr1-dev-plus-aosp
am:
7ab6a8eba1
Change-Id: Ie81be947c6aa29da177658ddba3f5354673350d1
Jeff Sharkey [Sun, 31 Jul 2016 03:20:44 +0000 (03:20 +0000)]
String tweak \\\"upgrading\\\" to \\\"finishing\\\". am:
a4600cc6d0 am:
22f7d91489
am:
a152f4eda7
Change-Id: If4813f706b327c6a186f4f49d064db3e9962ae3d
Annie Chin [Sun, 31 Jul 2016 03:20:35 +0000 (03:20 +0000)]
Merge \"Merge \\\"Add methods for setCarMode()\\\" into nyc-mr1-dev am:
81e5dffdd0 am:
7d1d1a127f\" into nyc-mr1-dev-plus-aosp
am:
788fad6bea
Change-Id: I0328c1d01cccb70b842d4c1ef7fba906090e5ce3
Jeff Sharkey [Sun, 31 Jul 2016 03:20:32 +0000 (03:20 +0000)]
Merge \\\"Add methods for setCarMode()\\\" into nyc-mr1-dev am:
81e5dffdd0 am:
7d1d1a127f
am:
d45b023785
Change-Id: Ice45a53b658a36f7dafcf5bf080530160d320bf7
Annie Chin [Sun, 31 Jul 2016 03:19:54 +0000 (03:19 +0000)]
Merge changes from topic \'am-
6b03419d66d24fd58cdd059bde903191\' into nyc-mr1-dev-plus-aosp
am:
6b6a359659
Change-Id: I91c1c3b5f645eb4cd61a47ae2575a21ea4407aa0
Annie Chin [Sun, 31 Jul 2016 03:19:11 +0000 (03:19 +0000)]
Merge \\\"Add methods for setCarMode()\\\" into nyc-mr1-dev am:
81e5dffdd0 am:
e372b93bef
am:
375b669405
Change-Id: I36057b5313a451a3990e5e2ff021d1ac67cfdd04
Annie Chin [Sun, 31 Jul 2016 03:17:52 +0000 (03:17 +0000)]
Add methods for setCarMode() am:
389f091892 am:
8d6e08e756
am:
dfd23e0f7a
Change-Id: Ib95f99965160b857b0ebc04cbe69f6f76d0dbda6
Tony Mak [Sun, 31 Jul 2016 03:17:44 +0000 (03:17 +0000)]
Merge \"Merge \\\"We should registerContentObserver with app\\\'s user id\\\" into nyc-mr1-dev am:
97fc17ce8e am:
7572ca23bd\" into nyc-mr1-dev-plus-aosp
am:
2b3b39da08
Change-Id: Ibf5f36356dea828d2c04b39854749f412fb20b83
Tony Mak [Sun, 31 Jul 2016 03:17:41 +0000 (03:17 +0000)]
Merge \\\"We should registerContentObserver with app\\\'s user id\\\" into nyc-mr1-dev am:
97fc17ce8e am:
7572ca23bd
am:
302d363f84
Change-Id: I80020158c6f3d3e248b0399bd597a1361b5e49d3
Tony Mak [Sun, 31 Jul 2016 03:02:34 +0000 (03:02 +0000)]
Merge \"We should registerContentObserver with app\\\'s user id am:
e46393e04b am:
6d2870facc\" into nyc-mr1-dev-plus-aosp
am:
1652f67d97
Change-Id: Ifc0a6758d120d1eef7c16b98cc44ab7f59f3707c
Tony Mak [Sun, 31 Jul 2016 03:02:31 +0000 (03:02 +0000)]
We should registerContentObserver with app\\\'s user id am:
e46393e04b am:
6d2870facc
am:
29b4a0efc6
Change-Id: Id51bcac742133f4547ead33f10ee5e2fc8a7382a
Andreas Gampe [Sun, 31 Jul 2016 03:02:25 +0000 (03:02 +0000)]
Merge \"Merge \\\"OtaDexoptService: Run dexopt on all apps\\\" into nyc-mr1-dev am:
58764e5ec6 am:
0488335f82\" into nyc-mr1-dev-plus-aosp
am:
529d759e4b
Change-Id: Idabf748e7606585d3f4a707828aacd7a95c1aba8
Andreas Gampe [Sun, 31 Jul 2016 03:02:21 +0000 (03:02 +0000)]
Merge \\\"OtaDexoptService: Run dexopt on all apps\\\" into nyc-mr1-dev am:
58764e5ec6 am:
0488335f82
am:
00c325e4df
Change-Id: I50f1f448cb147711b6d8542382dd0c3afbe2d1a4
Andreas Gampe [Sun, 31 Jul 2016 03:02:15 +0000 (03:02 +0000)]
Merge \"OtaDexoptService: Run dexopt on all apps am:
115514b236 am:
b4eef29820\" into nyc-mr1-dev-plus-aosp
am:
6d04543f6f
Change-Id: I13e646bd9bda3923b64616aef35b0d30cc279164
Andreas Gampe [Sun, 31 Jul 2016 03:02:12 +0000 (03:02 +0000)]
OtaDexoptService: Run dexopt on all apps am:
115514b236 am:
b4eef29820
am:
52567b8e3d
Change-Id: I566e5c7edb2434892f298b7ae1678cca65b120b9
Fan Zhang [Sun, 31 Jul 2016 03:02:05 +0000 (03:02 +0000)]
Merge \"Merge \\\"Align bottom text with battery graph in RTL layout.\\\" into nyc-mr1-dev am:
9669f426c7 am:
9007014b8a\" into nyc-mr1-dev-plus-aosp
am:
c55137fe0e
Change-Id: I8d95b142583484c4a66c5749a58da670a43ede11
Fan Zhang [Sun, 31 Jul 2016 03:02:01 +0000 (03:02 +0000)]
Merge \\\"Align bottom text with battery graph in RTL layout.\\\" into nyc-mr1-dev am:
9669f426c7 am:
9007014b8a
am:
a0fafd0b43
Change-Id: I344142c1e1bc2adbba08a0fb81c064439e0cbc11
Fan Zhang [Sun, 31 Jul 2016 03:01:53 +0000 (03:01 +0000)]
Merge \"Align bottom text with battery graph in RTL layout. am:
dd5469e488 am:
da61facecc\" into nyc-mr1-dev-plus-aosp
am:
1635b9e651
Change-Id: I97ae3c7cdd372d6ceb606b1110cdb4109e8d9455
Fan Zhang [Sun, 31 Jul 2016 03:01:50 +0000 (03:01 +0000)]
Align bottom text with battery graph in RTL layout. am:
dd5469e488 am:
da61facecc
am:
4247508627
Change-Id: Id42f83ed8fd48877e631aff2e79e01a720604121
Kevin Hufnagle [Sun, 31 Jul 2016 02:59:19 +0000 (02:59 +0000)]
Merge \\\\"docs: Improved Google Play Developer Console documentation\\\\" into nyc-docs am:
88f0518ce3 am:
72108d200d am:
47049a7e86
am:
8b5f40f36c
Change-Id: I8d695c00141a98e580c0df00aefcf8083ca67135
Kevin Hufnagle [Sun, 31 Jul 2016 02:59:16 +0000 (02:59 +0000)]
docs: Improved Google Play Developer Console documentation am:
ec8b21a27a am:
e37a55b840 am:
764df38258
am:
79d2dfac13
Change-Id: I8628925e534af719382692b538e634f2ef3d6e6a
Prashant Malani [Sun, 31 Jul 2016 02:59:13 +0000 (02:59 +0000)]
Merge \\"Let Rotary encoder events skip IME\\" into cw-f-dev am:
1fb9d1a848
am:
65f9a25547
Change-Id: Ia0447fcf1a2b3729c69027b8b69c3d2d78cf0ab5
Prashant Malani [Sun, 31 Jul 2016 02:59:11 +0000 (02:59 +0000)]
Let Rotary encoder events skip IME am:
fecbc67e0d
am:
a6bc98c003
Change-Id: Iecf4f32e56e3fac398b8ded665285af5e3632d2f
Sudheer Shanka [Sun, 31 Jul 2016 02:59:07 +0000 (02:59 +0000)]
Merge \\\"Allow apps with CREATE_USERS permission to call UM.getProfiles.\\\" into nyc-dev am:
b7c3ae1a86 am:
3e3aeef6f0
am:
d2e5c20554
Change-Id: I6096c27b593c20a24753b243a3b76d27ba8a2a3c
Sudheer Shanka [Sun, 31 Jul 2016 02:54:22 +0000 (02:54 +0000)]
Allow apps with CREATE_USERS permission to call UM.getProfiles. am:
7468091329 am:
59245383cf
am:
59348dc325
Change-Id: I10194ddb5f93f2af4a78dcbd6c3496df1cbc823e
Mark Lu [Sun, 31 Jul 2016 02:54:19 +0000 (02:54 +0000)]
Merge \\\\\"docs: fix escaped characters in data binding doc\\\\\" into nyc-docs am:
4172905146 am:
06c1159b0a am:
1fab755911 am:
a2891ed4e3
am:
546bb7a11d
Change-Id: I9353de9ea17c5f897d5f876a71c8cbee039b552a
Mark Lu [Sun, 31 Jul 2016 02:54:17 +0000 (02:54 +0000)]
docs: fix escaped characters in data binding doc am:
011c07bd80 am:
494d775cde am:
2d19e4314a am:
2fa31f8e37
am:
57c053283b
Change-Id: I638125d507fb779812b2842a5b9f11529f4fd52b
Mark Lu [Sun, 31 Jul 2016 02:54:14 +0000 (02:54 +0000)]
Merge \"Merge \\\\"docs: fix escaped characters in data binding doc\\\\" into nyc-docs am:
4172905146 am:
06c1159b0a am:
e6e257f46e\" into nyc-mr1-dev-plus-aosp
am:
e9d678de9a
Change-Id: I3f61d417b86d7f38dd63e8020fa3b91be32d6c61
Mark Lu [Sun, 31 Jul 2016 02:54:12 +0000 (02:54 +0000)]
Merge \\\\"docs: fix escaped characters in data binding doc\\\\" into nyc-docs am:
4172905146 am:
06c1159b0a am:
e6e257f46e
am:
70e9a816fa
Change-Id: Ib7a6c2616af9a73f601d2025a33ded0237122119
Mark Lu [Sun, 31 Jul 2016 02:54:04 +0000 (02:54 +0000)]
Merge \"docs: fix escaped characters in data binding doc am:
011c07bd80 am:
494d775cde am:
ee15ca4437\" into nyc-mr1-dev-plus-aosp
am:
1a66c204a5
Change-Id: I89f984cf7ba8d224e1f38d38bb87a8df45a739ca
Mark Lu [Sun, 31 Jul 2016 02:54:01 +0000 (02:54 +0000)]
docs: fix escaped characters in data binding doc am:
011c07bd80 am:
494d775cde am:
ee15ca4437
am:
051904462e
Change-Id: Ie66fae1de5e6a0716308a20b90331952b33d8a7b
Sungsoo Lim [Sun, 31 Jul 2016 02:51:24 +0000 (02:51 +0000)]
DO NOT MERGE: Fix CTS regression am:
df17644db7 am:
057b548171 am:
f645010092 -s ours am:
6489d870d7 -s ours am:
2dbb64594a am:
b6a3e8ce8e am:
b8d3dd2472 -s ours am:
e0316fc7a8 am:
bfdf9592d0 am:
59cb7ab7b8 am:
49f14fa7e0 -s ours am:
53e9affbf9 am:
54dd962416 am:
56ff60b465
am:
079eabb0fd -s ours
Change-Id: I7c94560da514155e7f53be321dd231ebbabfe41d
Sungsoo Lim [Sun, 31 Jul 2016 02:51:21 +0000 (02:51 +0000)]
DO NOT MERGE: Fix CTS regression am:
df17644db7 am:
057b548171 am:
f645010092 -s ours am:
6489d870d7 -s ours am:
2dbb64594a am:
b6a3e8ce8e am:
b8d3dd2472 -s ours am:
e0316fc7a8 am:
bfdf9592d0 am:
59cb7ab7b8 am:
49f14fa7e0 -s ours am:
53e9affbf9 am:
878abb9bf4
am:
59268fa678 -s ours
Change-Id: I3a5231fee239d881a9e22b0791519dfb8c4f42b4
Fyodor Kupolov [Sun, 31 Jul 2016 02:51:19 +0000 (02:51 +0000)]
Merge \\\"Cache package names after reboot\\\" into nyc-mr1-dev am:
77faae7282 am:
2c633e9b83
am:
c91f7c371b
Change-Id: Iba8af448ec695ff41a48d76f87f5e49ce50e6f51
Fyodor Kupolov [Sun, 31 Jul 2016 02:51:16 +0000 (02:51 +0000)]
Cache package names after reboot am:
773e997432 am:
94387b55c9
am:
3f51273df4
Change-Id: Ie45cb158ecc30d7d95e277aee38a38bb88d3bdbd
Sungsoo Lim [Sun, 31 Jul 2016 02:51:12 +0000 (02:51 +0000)]
DO NOT MERGE: Fix CTS regression am:
7a92dc9d99 am:
14abf736c8 am:
2df9864b54 -s ours am:
0bbdc37b60 am:
25782fae9b am:
dd2ec80035 am:
d056456fe2 -s ours am:
cd17df0011 am:
f3af9e5825 am:
6bcbe9a7aa
am:
0e7310757f -s ours
Change-Id: If65e230292773041871aaa201a86e72b91951c39
Sungsoo Lim [Sun, 31 Jul 2016 02:38:57 +0000 (02:38 +0000)]
DO NOT MERGE: Fix CTS regression am:
7a92dc9d99 am:
14abf736c8 am:
2df9864b54 -s ours am:
0bbdc37b60 am:
25782fae9b am:
dd2ec80035 am:
d056456fe2 -s ours am:
cd17df0011 am:
ccad5a8f22
am:
5134870f94 -s ours
Change-Id: I284c23f0be96bb12018dec30c132c27c36609696
Sungsoo Lim [Sun, 31 Jul 2016 02:38:55 +0000 (02:38 +0000)]
Merge \"DO NOT MERGE: Fix CTS regression am:
90be39c7bb am:
db9f504522 am:
b04c428935 am:
e71159c5f7 -s ours am:
204fdc49fc am:
58cf51abb7 am:
41d65fc3b8\" into nyc-mr1-dev-plus-aosp
am:
5f59a19c9a -s ours
Change-Id: Id1c9d9930b30fad11c28ed2f482ea3756bae2eb0
Sungsoo Lim [Sun, 31 Jul 2016 02:38:52 +0000 (02:38 +0000)]
DO NOT MERGE: Fix CTS regression am:
90be39c7bb am:
db9f504522 am:
b04c428935 am:
e71159c5f7 -s ours am:
204fdc49fc am:
58cf51abb7 am:
41d65fc3b8
am:
5587ab03be -s ours
Change-Id: I75bf6bc450335662795cb36bd63d2a11afd6cc65
Philip P. Moltmann [Sun, 31 Jul 2016 02:38:42 +0000 (02:38 +0000)]
Merge \"Merge \\\"Handle reset of recommended services\\\" into nyc-mr1-dev am:
0922e6c652 am:
76ce382352\" into nyc-mr1-dev-plus-aosp
am:
680ef25daa
Change-Id: I862f6446a8c2fa6491765409904e292f33df736b
Philip P. Moltmann [Sun, 31 Jul 2016 02:38:39 +0000 (02:38 +0000)]
Merge \\\"Handle reset of recommended services\\\" into nyc-mr1-dev am:
0922e6c652 am:
76ce382352
am:
318384a0b1
Change-Id: Ic72ab4fb65cb46d2f3a6e0e80bd068dc0ce66e9d
Philip P. Moltmann [Sun, 31 Jul 2016 02:38:32 +0000 (02:38 +0000)]
Merge \"Handle reset of recommended services am:
fe789f3189 am:
bc11f26a09\" into nyc-mr1-dev-plus-aosp
am:
2d50db73c2
Change-Id: Icdb9c4b6fdce8744b2e93b5335cb0efc2ca1d76c
Philip P. Moltmann [Sun, 31 Jul 2016 02:38:29 +0000 (02:38 +0000)]
Handle reset of recommended services am:
fe789f3189 am:
bc11f26a09
am:
36d68891a5
Change-Id: I13f55cee79c6117f95c9fe8b268b64c654af90a0
Sungsoo Lim [Sun, 31 Jul 2016 02:38:21 +0000 (02:38 +0000)]
DO NOT MERGE: Fix CTS regression am:
90be39c7bb am:
db9f504522 am:
b04c428935 am:
e71159c5f7 -s ours am:
204fdc49fc am:
4d90202dd3
am:
d4feca33ed -s ours
Change-Id: I145e0083d69203272ff175c8a1ae9c6a63d97afc
Felipe Leme [Sun, 31 Jul 2016 02:28:32 +0000 (02:28 +0000)]
Merge \\\"Increased size of data_saver_enable_title.\\\" into nyc-mr1-dev am:
c6655be308 am:
af24aba45c
am:
de93ed5f3f
Change-Id: Iab17a20513c6f153334c457e38fa765996ff9b37
Felipe Leme [Sun, 31 Jul 2016 02:28:29 +0000 (02:28 +0000)]
Increased size of data_saver_enable_title. am:
9b0e888ff9 am:
ecf5a195d7
am:
eb487056d1
Change-Id: I77d9f27584fd860e5d75c50befe3b9ad98f8001c
Phil Weaver [Sun, 31 Jul 2016 02:28:25 +0000 (02:28 +0000)]
Merge \\\"Prevent a11y seeing behind tasks w/modal windows.\\\" into nyc-mr1-dev am:
a200e774e7 am:
cf2477ddb4
am:
2ec83d5353
Change-Id: I45c4064e448194bbf4b7920211c996fa80e901df
Phil Weaver [Sun, 31 Jul 2016 02:28:23 +0000 (02:28 +0000)]
Prevent a11y seeing behind tasks w/modal windows. am:
ac9ad70086 am:
7fb5fcc3a6
am:
08a03c0e2d
Change-Id: Iee5ddf5920abba13f6b7532ede99295d9aeaf0c8
Michael Kwan [Sun, 31 Jul 2016 02:28:20 +0000 (02:28 +0000)]
Merge \\"Resolve issues with AlertDialog layout for watch devices.\\" into cw-f-dev am:
03da42c94d
am:
f85049dcb0
Change-Id: I1d2ac2496885e8f37acccf5e2c7b46b08a7e5828
Michael Kwan [Sun, 31 Jul 2016 02:25:53 +0000 (02:25 +0000)]
Resolve issues with AlertDialog layout for watch devices. am:
44ff1e1d13
am:
37cb57620d
Change-Id: I6a6b02b7aebfca73958a5d7531566aceac7f87f4
Makoto Onuki [Sun, 31 Jul 2016 02:25:48 +0000 (02:25 +0000)]
Merge \\\"LauncherApps should also throw when user is locked\\\" into nyc-mr1-dev am:
ba933b39ae am:
5e9d23dbd6
am:
d9c0ed997a
Change-Id: I871786a03242023138b9c3fe7363e16e7d8543dd
Makoto Onuki [Sun, 31 Jul 2016 02:25:45 +0000 (02:25 +0000)]
LauncherApps should also throw when user is locked am:
bc4ad85d29 am:
5ec63fc3c7
am:
3b5920b2a1
Change-Id: I60beb409a55297a9a2adaaf52f1ea1e185668c88
Fei Wu [Sun, 31 Jul 2016 02:25:42 +0000 (02:25 +0000)]
Merge \\"Optimize animation of watch switch thumb\\" into cw-f-dev am:
88ee6c8a37
am:
f99a41ac13
Change-Id: I0d66b3dd06fa99583fe608003ad43f70c25903aa
FEI WU [Sun, 31 Jul 2016 02:25:39 +0000 (02:25 +0000)]
Optimize animation of watch switch thumb am:
31f487642e
am:
1b398ab675
Change-Id: I0bc4e6dca4e3f05120b2d98166316908b3c541af
Michael Kwan [Sun, 31 Jul 2016 02:22:59 +0000 (02:22 +0000)]
Merge \\"Update text appearances for watch type device to conform with typography specs.\\" into cw-f-dev am:
46d89fd5af
am:
719b743831
Change-Id: I9b089a0cb4a13ff85ea3a6b1366084d4d7b5cab6
Michael Kwan [Sun, 31 Jul 2016 02:22:57 +0000 (02:22 +0000)]
Update text appearances for watch type device to conform with typography specs. am:
7a446bb3a5
am:
799abc8d6d
Change-Id: Ib6aff3ac60c4eb107a66ae2df0701733115c3131
Adam Powell [Sun, 31 Jul 2016 02:22:53 +0000 (02:22 +0000)]
Merge \\\"Force AlertDialogLayout to have gravity start|top\\\" into nyc-mr1-dev am:
8960c82dcd am:
d35f69d6cd
am:
4808455825
Change-Id: I31aa39fb182fc460b666ff962513dd8858c1208e
Adam Powell [Sun, 31 Jul 2016 02:22:51 +0000 (02:22 +0000)]
Force AlertDialogLayout to have gravity start|top am:
39e0bf23f5 am:
cc8fbd3f29
am:
58d91d51c2
Change-Id: Ic75f5fabdb1194005aaa1fdc9b095a45b81126dc
John Reck [Sun, 31 Jul 2016 02:22:46 +0000 (02:22 +0000)]
Merge \\\"Teach JankTracker about new swap behaviors\\\" into nyc-mr1-dev am:
34921ac110 am:
c452daab03
am:
c05f1ea40b
Change-Id: I41cafb6b921c793277ea0da2c2373d811f9e0998
Hugo Benichi [Sun, 31 Jul 2016 02:13:00 +0000 (02:13 +0000)]
Merge \\\"Fix missing IpConnectivity metrics\\\" into nyc-mr1-dev am:
66e7752ad1 am:
b2db402899
am:
fb5c675b7e
Change-Id: Iba1f81a892acd9f541b9dd564203bfebc56c9c73
Hugo Benichi [Sun, 31 Jul 2016 02:12:55 +0000 (02:12 +0000)]
Fix missing IpConnectivity metrics am:
90cbc5b444 am:
384818b99d
am:
942ad98481
Change-Id: Ia0e8835969c526424a717068f9bf08496694f1c3
Hugo Benichi [Sun, 31 Jul 2016 02:12:51 +0000 (02:12 +0000)]
Merge \\\"IpConnectivityMetrics: no metrics upload in tests\\\" into nyc-mr1-dev am:
1b4bd22f41 am:
6b104bdabf
am:
9ecb72151b
Change-Id: Iaa83e8914614fa874a88beb8821bb83e0dce5c09
Hugo Benichi [Sun, 31 Jul 2016 02:12:47 +0000 (02:12 +0000)]
IpConnectivityMetrics: no metrics upload in tests am:
f9fdf87af2 am:
ae048d8363
am:
36a38bc01b
Change-Id: I751af5bd8060dd9ec7e88a9f8cba3b1c2fae81b2
Winson [Sun, 31 Jul 2016 02:12:44 +0000 (02:12 +0000)]
Defaulting wallpaper offset to edge of the screen. am:
4b4ba90d66 am:
18faeaa5fa
am:
48f732db3a
Change-Id: I86d0616df8f938b1b80651be83802796a24250b9
Kevin Hufnagle [Sat, 30 Jul 2016 23:46:34 +0000 (23:46 +0000)]
docs: Improved Google Play Developer Console documentation am:
ec8b21a27a am:
e37a55b840 am:
941cf16f34
am:
14cd0becc0
Change-Id: Ie6c464fe94d5e3c005b924dbe66ac033be64b96a
Sudheer Shanka [Sat, 30 Jul 2016 23:46:30 +0000 (23:46 +0000)]
Merge \\\"Allow apps with CREATE_USERS permission to call UM.getProfiles.\\\" into nyc-dev am:
b7c3ae1a86 am:
61a2e48e15
am:
3b8a363d0d
Change-Id: I543f3a4544ad0265ebe114c1d13d89c7dfb11b50
Sudheer Shanka [Sat, 30 Jul 2016 23:46:25 +0000 (23:46 +0000)]
Allow apps with CREATE_USERS permission to call UM.getProfiles. am:
7468091329 am:
3e2e8962b1
am:
dfa5addbda
Change-Id: I2b5c5148a1bc8c7a77b955819f4e0aac4fe005e7
Jack Yu [Sat, 30 Jul 2016 23:34:42 +0000 (23:34 +0000)]
Merge \\"Added todo items for a potential metrics issue\\" into nyc-mr1-dev am:
a4e616e0dc
am:
bbdd486b3c
Change-Id: Iaf932a0c6b9a7497ac56a82eed91ce96dbbba6ae
Jack Yu [Sat, 30 Jul 2016 23:34:10 +0000 (23:34 +0000)]
Added todo items for a potential metrics issue am:
dc5a63bdd1
am:
94f2fe22b4
Change-Id: Id3a4f8985536f312c35718a1c992ecb505dbbebf
Dianne Hackborn [Sat, 30 Jul 2016 22:27:26 +0000 (22:27 +0000)]
Merge \\"Work on issue #
30407061: OverflowArrayMap.stopObject unable to find object\\" into nyc-mr1-dev am:
29cc1b6939
am:
ed7bd6c339
Change-Id: Id506137e17980fbff8bc1f3c5ed2e0942e07c14a
Dianne Hackborn [Sat, 30 Jul 2016 22:27:22 +0000 (22:27 +0000)]
Work on issue #
30407061: OverflowArrayMap.stopObject unable to find object am:
657153bd28
am:
ae7bdd8dde
Change-Id: Id9a3dfa2e18f62b2dc35396ae34ffb450ef8cbdc
Dongwon Kang [Sat, 30 Jul 2016 22:27:17 +0000 (22:27 +0000)]
Merge \\"MediaSession: Allow all profiles to handle work profile case.\\" into nyc-mr1-dev am:
ce21ca0fd2
am:
4be4068d0c
Change-Id: I7e601f4693311a7e3e2cc38baa8f68bb945413cc
Dongwon Kang [Sat, 30 Jul 2016 22:27:14 +0000 (22:27 +0000)]
MediaSession: Allow all profiles to handle work profile case. am:
8cf39c5d79
am:
73c1620dee
Change-Id: I4adfdc47325756a90b0719a95e5afedd8a444c8c
Robert Greenwalt [Sat, 30 Jul 2016 22:26:04 +0000 (22:26 +0000)]
Merge \\"Stop exposing LTE_CA as a rat type.\\" into nyc-mr1-dev am:
54be7c295b
am:
ee48ed3190
Change-Id: I6fbb82e472c875034223115e3e359838c9503554
Dan Willemsen [Sat, 30 Jul 2016 20:02:59 +0000 (13:02 -0700)]
resolve merge conflicts of
74bc31f to master
Change-Id: Ib922ebfb3d91a9c837181a3c652f079cec127f3e
Dan Willemsen [Sat, 30 Jul 2016 19:48:07 +0000 (12:48 -0700)]
resolve merge conflicts of
20a35b6 to nyc-mr1-dev-plus-aosp
Change-Id: Idd5fb6b64120af303a2987c7449e59face7d77be
Sungsoo Lim [Sat, 30 Jul 2016 08:35:07 +0000 (08:35 +0000)]
Merge \\\\\\\\\\"DO NOT MERGE: Fix CTS regression\\\\\\\\\\" into lmp-dev am:
124cc534f8 -s ours am:
3d58e326d9 am:
8ef8e2b648 am:
ec986ac944 -s ours am:
cc154342aa am:
ee0c3b013a am:
0d05028ba8 am:
2f7756f4c9 -s ours am:
ea7fa85a0d
am:
c4cabe1896
Change-Id: I978f3d9b969089e16b4bf709e4ca3be60fbb2232
Sungsoo Lim [Sat, 30 Jul 2016 08:22:24 +0000 (08:22 +0000)]
Merge \\\\\\\\\"DO NOT MERGE: Fix CTS regression\\\\\\\\\" into lmp-dev am:
124cc534f8 -s ours am:
3d58e326d9 am:
8ef8e2b648 am:
ec986ac944 -s ours am:
cc154342aa am:
ee0c3b013a am:
0d05028ba8 am:
2f7756f4c9 -s ours
am:
ea7fa85a0d
Change-Id: I1034da2c59cc363d371e5c0a0a87cf611f5949c6
Sungsoo Lim [Sat, 30 Jul 2016 08:17:49 +0000 (08:17 +0000)]
Merge \\\\\\\\"DO NOT MERGE: Fix CTS regression\\\\\\\\" into lmp-dev am:
124cc534f8 -s ours am:
3d58e326d9 am:
8ef8e2b648 am:
ec986ac944 -s ours am:
cc154342aa am:
ee0c3b013a am:
0d05028ba8
am:
2f7756f4c9 -s ours
Change-Id: I98ceec760f862404e48477472f4931f8d49490f1
Sungsoo Lim [Sat, 30 Jul 2016 08:11:04 +0000 (08:11 +0000)]
Merge \\\\\\\"DO NOT MERGE: Fix CTS regression\\\\\\\" into lmp-dev am:
124cc534f8 -s ours am:
3d58e326d9 am:
8ef8e2b648 am:
ec986ac944 -s ours am:
cc154342aa am:
ee0c3b013a
am:
0d05028ba8
Change-Id: Ia66f61ac4d53b2908b6a468375346c21c61c2d5a
OSDN Git Service
