OSDN Git Service
Beverly Tai [Thu, 7 Jun 2018 13:33:11 +0000 (13:33 +0000)]
Merge "Add ChargingStarted + InCallNotif to AudioPackage"
TreeHugger Robot [Thu, 7 Jun 2018 10:06:17 +0000 (10:06 +0000)]
Merge "PointerLocationView: Add top padding to header if there is a cutout"
Ryan Mitchell [Thu, 7 Jun 2018 07:16:39 +0000 (00:16 -0700)]
[automerger skipped] Merge changes from topic "dynamic-ref-se-mnc-dev" into oc-dev am:
2d31069fac am:
53ff808f99 -s ours am:
35dfd46378 -s ours am:
a76360ddf1 -s ours
am:
cc8d9f814b -s ours
Change-Id: If2926751c07d2823e2a84f20142e2830e3d1b584
Ryan Mitchell [Thu, 7 Jun 2018 07:03:04 +0000 (00:03 -0700)]
Merge changes from topic "am-
c1e91e5e-2686-4871-b188-
107c0ddf3273" into oc-dev am:
075bcf73c8 am:
dff068e1e8 am:
366031e336 am:
5dcf0e0f65
am:
786287092a
Change-Id: I2e883c4dc0fcdffd284c95bbcffc61416b31e775
Ryan Mitchell [Thu, 7 Jun 2018 06:08:05 +0000 (23:08 -0700)]
[automerger skipped] Merge changes from topic "dynamic-ref-se-mnc-dev" into oc-dev am:
2d31069fac am:
53ff808f99 -s ours am:
35dfd46378 -s ours
am:
a76360ddf1 -s ours
Change-Id: I9487f439cf725b856c865dc29629f25814f51c29
Ryan Mitchell [Thu, 7 Jun 2018 05:53:12 +0000 (22:53 -0700)]
Merge changes from topic "am-
c1e91e5e-2686-4871-b188-
107c0ddf3273" into oc-dev am:
075bcf73c8 am:
dff068e1e8 am:
366031e336
am:
5dcf0e0f65
Change-Id: Iaec794eef67f37b4d9e9d5401bea435562ccec29
Ryan Mitchell [Thu, 7 Jun 2018 05:24:04 +0000 (22:24 -0700)]
[automerger skipped] Merge changes from topic "dynamic-ref-se-mnc-dev" into oc-dev am:
2d31069fac am:
53ff808f99 -s ours
am:
35dfd46378 -s ours
Change-Id: Icc7661bca07e16f0b230b35ab7f1df8f0d8a8189
Ryan Mitchell [Thu, 7 Jun 2018 04:26:05 +0000 (21:26 -0700)]
Merge changes from topic "am-
c1e91e5e-2686-4871-b188-
107c0ddf3273" into oc-dev am:
075bcf73c8 am:
dff068e1e8
am:
366031e336
Change-Id: I815ba23c884d6891b2acba23687db0d4d1cab98a
Ryan Mitchell [Thu, 7 Jun 2018 04:19:51 +0000 (21:19 -0700)]
[automerger skipped] Merge changes from topic "dynamic-ref-se-mnc-dev" into oc-dev am:
2d31069fac
am:
53ff808f99 -s ours
Change-Id: Ia9736d803a7b980bafb5b55d76c99a7ee29c68c3
Ryan Mitchell [Thu, 7 Jun 2018 03:49:18 +0000 (20:49 -0700)]
Merge changes from topic "am-
c1e91e5e-2686-4871-b188-
107c0ddf3273" into oc-dev am:
075bcf73c8
am:
dff068e1e8
Change-Id: I562e53f089ca19fc145a34fb539556ae92d05722
Tony Huang [Thu, 7 Jun 2018 03:17:55 +0000 (03:17 +0000)]
Merge "Fix dialog pop up when click disabled battery saver tile"
Felipe Leme [Thu, 7 Jun 2018 03:09:35 +0000 (20:09 -0700)]
Merge "Document -n option on intent specification." into pi-dev am:
39f04a7da4
am:
c0830f8f2a
Change-Id: I27e11342c073d1d019ecd183044d97e67399532d
Winson Chung [Thu, 7 Jun 2018 03:00:32 +0000 (20:00 -0700)]
Merge "Skip finishing menu activity when dismissing PiP" into pi-dev am:
fc16950683
am:
713695f8cd
Change-Id: I8f186a0c32ebed1ce8f40106b82d58a7146dbdb1
Felipe Leme [Thu, 7 Jun 2018 02:55:38 +0000 (19:55 -0700)]
Merge "Document -n option on intent specification." into pi-dev
am:
39f04a7da4
Change-Id: Id8b23acedbd9fe3eb73438b1397a6ff80d36c267
Winson Chung [Thu, 7 Jun 2018 02:50:23 +0000 (19:50 -0700)]
Merge "Skip finishing menu activity when dismissing PiP" into pi-dev
am:
fc16950683
Change-Id: I2745a8ab3e22a49975bc0311ef8bf7bfc5e109e9
Ryan Mitchell [Thu, 7 Jun 2018 01:53:39 +0000 (18:53 -0700)]
Merge changes from topic "dynamic-ref-se-mnc-dev" into oc-dev
am:
2d31069fac
Change-Id: I282ef1b63da084bb0906bee79ec5a7b0e9e66a2c
Ryan Mitchell [Thu, 7 Jun 2018 01:30:51 +0000 (18:30 -0700)]
Merge changes from topic "am-
c1e91e5e-2686-4871-b188-
107c0ddf3273" into oc-dev
am:
075bcf73c8
Change-Id: I926986b532e52b423555f9fb6540ccfe50eee075
Sundong Ahn [Thu, 7 Jun 2018 01:26:30 +0000 (18:26 -0700)]
[automerger skipped] Merge "com.android.mediadrm.signer is built with java_sdk_library" into pi-dev-plus-aosp
am:
611488ceac -s ours
Change-Id: Ia6cddb5a3660ebc8c33a7c04497dfb6aebe5837d
Amith Yamasani [Thu, 7 Jun 2018 01:20:41 +0000 (18:20 -0700)]
[automerger skipped] Merge "DO NOT MERGE Fix security exception due to incorrect flags" into pi-dev am:
9f1885dee8
am:
6f13c43619 -s ours
Change-Id: I736a703c7a23f5cee0ce7e9896f688624569c24c
TreeHugger Robot [Thu, 7 Jun 2018 01:20:04 +0000 (01:20 +0000)]
Merge "com.android.mediadrm.signer is built with java_sdk_library" into pi-dev-plus-aosp
Tyler Gunn [Thu, 7 Jun 2018 01:08:05 +0000 (18:08 -0700)]
Merge "Merge "Ensure self-managed calls use voip audio mode." am:
b62aa315d1 am:
fd3e10b1bc" into pi-dev-plus-aosp
am:
6823c8a822
Change-Id: I1352a44cbb55fdeeb79771b27055a70b83a3cbb8
Felipe Leme [Thu, 7 Jun 2018 00:50:42 +0000 (17:50 -0700)]
Merge "Minor autofill logging improvements." into pi-dev am:
125c19a2f5
am:
d2fd5d3eba
Change-Id: Id3f6f59dd355f474f8c1a5d44d36a20ed360aa45
Nan Zhang [Thu, 7 Jun 2018 00:46:19 +0000 (17:46 -0700)]
[automerger skipped] Merge "Add metalava-api-stubs targets" into pi-dev am:
a08d1ffbb7 -s ours
am:
4d9c94d541 -s ours
Change-Id: I78abaa5f7256d6837efcb5f6c00bf9aa7efa449a
TreeHugger Robot [Thu, 7 Jun 2018 00:36:10 +0000 (00:36 +0000)]
Merge "Document -n option on intent specification." into pi-dev
Winson Chung [Thu, 7 Jun 2018 00:35:54 +0000 (00:35 +0000)]
Merge "Skip finishing menu activity when dismissing PiP" into pi-dev
Amith Yamasani [Wed, 6 Jun 2018 23:54:49 +0000 (16:54 -0700)]
Merge "DO NOT MERGE Fix security exception due to incorrect flags" into pi-dev
am:
9f1885dee8
Change-Id: Idb0ba52a58231ce9ede97b158a1cb38d1a9633ae
Nan Zhang [Wed, 6 Jun 2018 23:54:00 +0000 (16:54 -0700)]
[automerger skipped] Add metalava-api-stubs targets am:
bd9eda5094 -s ours
am:
99757e98c6 -s ours
Change-Id: Ie5507dd6a3c0ab4b22edb392ec713cf13addb66a
Ryan Mitchell [Wed, 6 Jun 2018 23:43:03 +0000 (16:43 -0700)]
Merge "Fix DynamicRefTable::load security bug" into oc-mr1-dev am:
2b6805fedc am:
5ae85666ac
am:
6899839e07
Change-Id: I3920ae30c0fdd5ef5b1176476d769abb269d5844
TreeHugger Robot [Wed, 6 Jun 2018 23:35:13 +0000 (23:35 +0000)]
Merge "DO NOT MERGE Fix security exception due to incorrect flags" into pi-dev
Android Build Merger (Role) [Wed, 6 Jun 2018 23:34:19 +0000 (23:34 +0000)]
Merge "Merge "Ensure self-managed calls use voip audio mode." am:
b62aa315d1 am:
fd3e10b1bc" into pi-dev-plus-aosp
Mihai Popa [Wed, 6 Jun 2018 23:34:19 +0000 (16:34 -0700)]
[automerger skipped] [automerger] Optimise the hit test algorithm am:
3b6f84b77c am:
5b224ccf41 skipped:
eb86ac42e6 am:
a60d0b2e93 am:
a16b03c540 am:
acb5b014af am:
c62d510887 am:
ea648c6a2b am:
83d9688077 am:
ce1d540693 -s ours am:
ac169beb52 -s ours am:
4ae55000b2 -s ours am:
c69da1474a -s ours
am:
c4aa718dbf -s ours
Change-Id: I3bda9dd39d12da0baee6624c07d9491050db094f
Tyler Gunn [Wed, 6 Jun 2018 23:33:19 +0000 (16:33 -0700)]
Merge "Ensure self-managed calls use voip audio mode." am:
b62aa315d1
am:
fd3e10b1bc
Change-Id: I8f7842fa84fcce91a292b32189cd827b4a125fb0
Ryan Mitchell [Wed, 6 Jun 2018 23:33:08 +0000 (23:33 +0000)]
Merge changes from topic "dynamic-ref-se-mnc-dev" into oc-dev
* changes:
[automerger] Fix DynamicRefTable::load security bug am:
8cf0f988b0 am:
d65dbf91ce am:
aeb2fc64d9 am:
0938689606 am:
6f76fbfc69 am:
69b14d2a1a am:
c7e3991628 am:
c3aa2a4d3f am:
648a950ce9
[automerger] Fix DynamicRefTable::load security bug am:
8cf0f988b0 am:
d65dbf91ce am:
aeb2fc64d9 am:
0938689606 am:
6f76fbfc69 am:
69b14d2a1a am:
c7e3991628 am:
c3aa2a4d3f
[automerger] Fix DynamicRefTable::load security bug am:
8cf0f988b0 am:
d65dbf91ce am:
aeb2fc64d9 am:
0938689606 am:
6f76fbfc69 am:
69b14d2a1a am:
c7e3991628
[automerger] Fix DynamicRefTable::load security bug am:
8cf0f988b0 am:
d65dbf91ce am:
aeb2fc64d9 am:
0938689606 am:
6f76fbfc69 am:
69b14d2a1a
[automerger] Fix DynamicRefTable::load security bug am:
8cf0f988b0 am:
d65dbf91ce am:
aeb2fc64d9 am:
0938689606 am:
6f76fbfc69
[automerger] Fix DynamicRefTable::load security bug am:
8cf0f988b0 am:
d65dbf91ce am:
aeb2fc64d9 am:
0938689606
[automerger] Fix DynamicRefTable::load security bug am:
8cf0f988b0 am:
d65dbf91ce am:
aeb2fc64d9
[automerger] Fix DynamicRefTable::load security bug am:
8cf0f988b0 am:
d65dbf91ce
[automerger] Fix DynamicRefTable::load security bug am:
8cf0f988b0
Fix DynamicRefTable::load security bug
Felipe Leme [Wed, 6 Jun 2018 23:29:57 +0000 (16:29 -0700)]
Merge "Minor autofill logging improvements." into pi-dev
am:
125c19a2f5
Change-Id: I4dca54b82b83f0b710aec84fd9982741b6074660
Nan Zhang [Wed, 6 Jun 2018 23:24:59 +0000 (16:24 -0700)]
[automerger skipped] Merge "Add metalava-api-stubs targets" into pi-dev
am:
a08d1ffbb7 -s ours
Change-Id: I94771fe7b2726a1dd0cf53b10e0446abaeaa948c
Evan Laird [Wed, 6 Jun 2018 23:20:14 +0000 (16:20 -0700)]
Merge "Status bar etc dots 4dp" into pi-dev am:
d54c3a3036
am:
9d55905221
Change-Id: Ib805a1ebb26c495dbf4704b992bf5fe6bdf67b2a
Nan Zhang [Wed, 6 Jun 2018 23:17:13 +0000 (16:17 -0700)]
[automerger skipped] Add metalava-api-stubs targets
am:
bd9eda5094 -s ours
Change-Id: I886b50c76c344d13db8464a7406e19efc4b72335
Dieter Hsu [Wed, 6 Jun 2018 23:14:58 +0000 (16:14 -0700)]
Merge "Update notifications on density or font size change for current user" into pi-dev am:
1394b342e3
am:
f26e86b473
Change-Id: Ica6434173ed8bd06ab9c4c88002ada98edacf898
Ryan Mitchell [Wed, 6 Jun 2018 23:09:35 +0000 (16:09 -0700)]
Merge "Fix DynamicRefTable::load security bug" into oc-mr1-dev am:
2b6805fedc
am:
5ae85666ac
Change-Id: I64521a290482adb5ade95b641ce9c0c27031a814
TreeHugger Robot [Wed, 6 Jun 2018 23:06:28 +0000 (23:06 +0000)]
Merge "Minor autofill logging improvements." into pi-dev
Tyler Gunn [Wed, 6 Jun 2018 23:03:46 +0000 (16:03 -0700)]
Merge "Ensure self-managed calls use voip audio mode."
am:
b62aa315d1
Change-Id: I262357c1aa9a23270edc2f1b1df409840fbf626d
Mihai Popa [Wed, 6 Jun 2018 23:03:45 +0000 (16:03 -0700)]
[automerger skipped] [automerger] Optimise the hit test algorithm am:
3b6f84b77c am:
5b224ccf41 skipped:
eb86ac42e6 am:
a60d0b2e93 am:
a16b03c540 am:
acb5b014af am:
c62d510887 am:
ea648c6a2b am:
83d9688077 am:
ce1d540693 -s ours am:
ac169beb52 -s ours am:
4ae55000b2 -s ours
am:
c69da1474a -s ours
Change-Id: I74d2a2cc21fe6978d9a9bda401bdf0f35e1fefe9
Nan Zhang [Wed, 6 Jun 2018 23:01:51 +0000 (23:01 +0000)]
Merge "Add metalava-api-stubs targets" into pi-dev
Ryan Mitchell [Wed, 6 Jun 2018 22:50:57 +0000 (15:50 -0700)]
Merge "Fix DynamicRefTable::load security bug" into oc-mr1-dev
am:
2b6805fedc
Change-Id: I5ef0a789b16dc8aa0936d8fcca3917ce2f884d74
Mihai Popa [Wed, 6 Jun 2018 22:46:03 +0000 (15:46 -0700)]
[automerger skipped] [automerger] Optimise the hit test algorithm am:
3b6f84b77c am:
5b224ccf41 skipped:
eb86ac42e6 am:
a60d0b2e93 am:
a16b03c540 am:
acb5b014af am:
c62d510887 am:
ea648c6a2b am:
83d9688077 am:
ce1d540693 -s ours am:
ac169beb52 -s ours
am:
4ae55000b2 -s ours
Change-Id: I16b4f8d33496eb6f7770a56c1907aab0a69da0ae
Evan Laird [Wed, 6 Jun 2018 22:44:20 +0000 (15:44 -0700)]
Merge "Status bar etc dots 4dp" into pi-dev
am:
d54c3a3036
Change-Id: I49514e9213e36ff5d3138c0b352af4be9b370282
Dieter Hsu [Wed, 6 Jun 2018 22:37:21 +0000 (15:37 -0700)]
Merge "Update notifications on density or font size change for current user" into pi-dev
am:
1394b342e3
Change-Id: I913e56f9da1676df6ce78e18fc9a47cca101e481
Lucas Dupin [Wed, 6 Jun 2018 22:33:25 +0000 (15:33 -0700)]
Merge "Always cancel clock animation" into pi-dev am:
a1cb973366
am:
0d6753d1ed
Change-Id: I855e9dcc604514322b2f817f03759ca2b6593fe8
Chavi Weingarten [Wed, 6 Jun 2018 22:27:51 +0000 (15:27 -0700)]
Merge "Prevent IME from showing when AOD shown or windows not drawn." into pi-dev am:
cf5514257f
am:
34878a27d7
Change-Id: If16150ea0b95a1cb40a0af184ca22a08892d3988
Lucas Dupin [Wed, 6 Jun 2018 22:24:17 +0000 (15:24 -0700)]
Merge "Always cancel clock animation" into pi-dev
am:
a1cb973366
Change-Id: I20406102b51c0dcbbd4a1fc122b89f98e2412607
TreeHugger Robot [Wed, 6 Jun 2018 22:16:36 +0000 (22:16 +0000)]
Merge "Fix DynamicRefTable::load security bug" into oc-mr1-dev
TreeHugger Robot [Wed, 6 Jun 2018 22:09:54 +0000 (22:09 +0000)]
Merge changes from topic "am-
c1e91e5e-2686-4871-b188-
107c0ddf3273" into oc-dev
* changes:
[automerger] ResStringPool: Prevenet boot loop from se fix am:
c31cf80008 am:
fd1097e436 am:
5a632d1b59 am:
6714a260e6 am:
3a272fe404 am:
3926163983 am:
ad43c89030 am:
a659d7c233 am:
c51c6751d7
[automerger] ResStringPool: Prevenet boot loop from se fix am:
c31cf80008 am:
fd1097e436 am:
5a632d1b59 am:
6714a260e6 am:
3a272fe404 am:
3926163983 am:
ad43c89030 am:
a659d7c233
[automerger] ResStringPool: Prevenet boot loop from se fix am:
c31cf80008 am:
fd1097e436 am:
5a632d1b59 am:
6714a260e6 am:
3a272fe404 am:
3926163983 am:
ad43c89030
[automerger] ResStringPool: Prevenet boot loop from se fix am:
c31cf80008 am:
fd1097e436 am:
5a632d1b59 am:
6714a260e6 am:
3a272fe404 am:
3926163983
[automerger] ResStringPool: Prevenet boot loop from se fix am:
c31cf80008 am:
fd1097e436 am:
5a632d1b59 am:
6714a260e6 am:
3a272fe404
[automerger] ResStringPool: Prevenet boot loop from se fix am:
c31cf80008 am:
fd1097e436 am:
5a632d1b59 am:
6714a260e6
[automerger] ResStringPool: Prevenet boot loop from se fix am:
c31cf80008 am:
fd1097e436 am:
5a632d1b59
[automerger] ResStringPool: Prevenet boot loop from se fix am:
c31cf80008 am:
fd1097e436
[automerger] ResStringPool: Prevenet boot loop from se fix am:
c31cf80008
ResStringPool: Prevenet boot loop from se fix
Chavi Weingarten [Wed, 6 Jun 2018 22:09:19 +0000 (15:09 -0700)]
Merge "Prevent IME from showing when AOD shown or windows not drawn." into pi-dev
am:
cf5514257f
Change-Id: I0bc09f864a5971eca059bdf559d91793bb9bba08
Emilian Peev [Wed, 6 Jun 2018 21:58:20 +0000 (14:58 -0700)]
Merge "media: Check window connect status in ImageWriter" into pi-dev am:
596fea9581
am:
d60a056d7c
Change-Id: I0ae2650118a26fc2e13885faac3373f50c7ae1a6
Emilian Peev [Wed, 6 Jun 2018 21:51:26 +0000 (14:51 -0700)]
Merge "media: Check window connect status in ImageWriter" into pi-dev
am:
596fea9581
Change-Id: If1fee999ef937e74bf4ac23380e27dbea231655a
Android Build Merger (Role) [Wed, 6 Jun 2018 21:36:42 +0000 (21:36 +0000)]
Merge "Merge "Fix PiP regression when the stack animation is canceled" into pi-dev am:
19cfc1a754 am:
260418cecf"
Alice Sheng [Wed, 6 Jun 2018 21:35:01 +0000 (21:35 +0000)]
Merge "Clean up Wear CPU scaling and swap experiments."
Winson Chung [Wed, 6 Jun 2018 21:31:16 +0000 (14:31 -0700)]
Merge "Fix PiP regression when the stack animation is canceled" into pi-dev am:
19cfc1a754
am:
260418cecf
Change-Id: Iac94f944a22ce6ef756020733effe3c4385f58fe
TreeHugger Robot [Wed, 6 Jun 2018 21:21:37 +0000 (21:21 +0000)]
Merge "Status bar etc dots 4dp" into pi-dev
Winson Chung [Wed, 6 Jun 2018 21:19:43 +0000 (14:19 -0700)]
Merge "Fix PiP regression when the stack animation is canceled" into pi-dev
am:
19cfc1a754
Change-Id: I4a4a0edb7931770b1c36dff87397667592e4db19
Rohan Shah [Wed, 6 Jun 2018 21:19:43 +0000 (14:19 -0700)]
Merge "[QS] Change Date font in QQS" into pi-dev am:
c754707b76
am:
dc47eecd52
Change-Id: If8254f9558a2a27e338fbce7dba7ed7ba3681ddb
Tyler Gunn [Wed, 6 Jun 2018 21:19:04 +0000 (21:19 +0000)]
Merge "Ensure self-managed calls use voip audio mode."
Jeff Sharkey [Wed, 6 Jun 2018 21:14:29 +0000 (21:14 +0000)]
Merge "Check for null path in getInternalPathForUser"
Tracy Zhou [Wed, 6 Jun 2018 21:09:02 +0000 (14:09 -0700)]
Merge "Fix "swipe up to switch apps" pop up displaying in SUW while creating second user." into pi-dev am:
dd12d33981
am:
407a2c1f8d
Change-Id: I6ecd89d81d2cfe344289489292f73d553409d115
Rohan Shah [Wed, 6 Jun 2018 21:05:53 +0000 (14:05 -0700)]
Merge "[QS] Change Date font in QQS" into pi-dev
am:
c754707b76
Change-Id: I213e6b16ec15e5f93c46f810d7b0cf4cb3e17699
Tracy Zhou [Wed, 6 Jun 2018 20:54:54 +0000 (13:54 -0700)]
Merge "Fix "swipe up to switch apps" pop up displaying in SUW while creating second user." into pi-dev
am:
dd12d33981
Change-Id: I5505d82dca3ba030793fc4fd483b18fa2a4b6be0
Sunny Goyal [Wed, 6 Jun 2018 20:48:24 +0000 (13:48 -0700)]
Merge "Changing the recents component to point to launcher3 implementation" into pi-dev am:
09dc071562
am:
ddedeb07ee
Change-Id: I5e6dd3c2aba17aec4a104ba5fa3155117f7d8e9c
Bill Yi [Wed, 6 Jun 2018 20:42:59 +0000 (13:42 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am:
6824fdb401 -s ours
am:
0bdc028743 -s ours
Change-Id: I67f84a0f4ad58814894ff357867c1930484fb7a0
Selim Cinek [Wed, 6 Jun 2018 20:41:40 +0000 (13:41 -0700)]
Merge "Fix exception from DateTimeView unregisters receiver again" into pi-dev am:
a2537b7269
am:
96bc1cada2
Change-Id: If514fce8446cfb0a10380ce2db2b324575b13fd8
Mihai Popa [Wed, 6 Jun 2018 20:36:14 +0000 (13:36 -0700)]
[automerger skipped] [automerger] Optimise the hit test algorithm am:
3b6f84b77c am:
5b224ccf41 skipped:
eb86ac42e6 am:
a60d0b2e93 am:
a16b03c540 am:
acb5b014af am:
c62d510887 am:
ea648c6a2b am:
83d9688077 am:
ce1d540693 -s ours
am:
ac169beb52 -s ours
Change-Id: Iaba870a637bd42807578d5846a819e4bead5adb4
Bill Yi [Wed, 6 Jun 2018 20:36:01 +0000 (13:36 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am:
891fa6f6af -s ours
am:
0e82f4e238 -s ours
Change-Id: Id46bc303aff572011a89e6edf66cd6f80b292a43
Bill Yi [Wed, 6 Jun 2018 20:34:46 +0000 (13:34 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am:
d3e66495cd -s ours
am:
a2cbba495d -s ours
Change-Id: I8d286072e6ee6db15a92ed6b75321cc4cb30526e
Bill Yi [Wed, 6 Jun 2018 20:33:16 +0000 (13:33 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am:
158e38c3ed -s ours
am:
e80901e137 -s ours
Change-Id: I6b6384719002e1cc7f3616be1515b300156c8de6
Nan Zhang [Wed, 6 Jun 2018 02:01:32 +0000 (19:01 -0700)]
Add metalava-api-stubs targets
Also removed --exact-api flag since Metalava has not supported it yet.
Test: Manually checked-in prebuilt metalava.jar to my local src tree and
compare the results between old and new docs/stubs generation.
Bug: b/
78245848
Change-Id: I863430a563a25370f2ad65c19984cab37f611c2e
Merged-In: Ie0943d306af4176d965425ec85236cd173c1e870
Nicolas Geoffray [Wed, 6 Jun 2018 20:31:49 +0000 (13:31 -0700)]
Merge "Light grey bugbot updates." into pi-dev am:
bfa0ee12cf
am:
10c6f9f3b2
Change-Id: I0b1fac4240f194a64cb2eee04fbf12da553f5e3c
Sunny Goyal [Wed, 6 Jun 2018 20:30:25 +0000 (13:30 -0700)]
Merge "Changing the recents component to point to launcher3 implementation" into pi-dev
am:
09dc071562
Change-Id: Ia42dfe2e058c9ea024b5a175d317b31a097f90cc
Mihai Popa [Wed, 6 Jun 2018 20:25:54 +0000 (13:25 -0700)]
[automerger skipped] Merge changes from topic "am-
2d17369d-a241-482f-bad0-
edb5147de00b" into oc-dev am:
3fce74a7f3 -s ours am:
bb18c011aa -s ours am:
7478894a89 -s ours am:
999d9e1bf0 -s ours
am:
564fecfdb7 -s ours
Change-Id: I3a2d13dc94e3dbd5c7e30087e3fb3dcd4f02604f
Bill Yi [Wed, 6 Jun 2018 20:11:47 +0000 (13:11 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am:
6824fdb401 -s ours
Change-Id: If5d1795cb37afef412bec06959647fe0fb09c7e3
Selim Cinek [Wed, 6 Jun 2018 20:11:13 +0000 (13:11 -0700)]
Merge "Fix exception from DateTimeView unregisters receiver again" into pi-dev
am:
a2537b7269
Change-Id: I0a2e1042bc288ab62ab5a7e2e13c9e51336b35f7
Bill Yi [Wed, 6 Jun 2018 19:56:10 +0000 (12:56 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am:
891fa6f6af -s ours
Change-Id: I894b8cfb60049b3725e006c4ea81f6a265b53e7b
TreeHugger Robot [Wed, 6 Jun 2018 19:55:20 +0000 (19:55 +0000)]
Merge "Allow cross user usage event queries"
Bill Yi [Wed, 6 Jun 2018 19:54:56 +0000 (12:54 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am:
d3e66495cd -s ours
Change-Id: Ifd03b185b954339ccf05166a8cf323aeb74e064c
Bill Yi [Wed, 6 Jun 2018 19:52:50 +0000 (12:52 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am:
158e38c3ed -s ours
Change-Id: Ib49818f0037ce9e7ca80d9e2244de3f7bad7b0f3
Amith Yamasani [Wed, 6 Jun 2018 17:48:03 +0000 (10:48 -0700)]
DO NOT MERGE Fix security exception due to incorrect flags
Caught by test UsageStatsTest due to stricter checks for
MATCH_ANY_USER.
Change-Id: Ie884c7007a8588a222773fba8d7967bcdf2a528a
Fixes:
109700742
Test: atest CtsUsageStatsTestCases:UsageStatsTest
TreeHugger Robot [Wed, 6 Jun 2018 19:51:15 +0000 (19:51 +0000)]
Merge "Update notifications on density or font size change for current user" into pi-dev
Nicolas Geoffray [Wed, 6 Jun 2018 19:50:53 +0000 (12:50 -0700)]
Merge "Light grey bugbot updates." into pi-dev
am:
bfa0ee12cf
Change-Id: I7f43dc0677b00234fa33f5e01ebdc330a7568f05
Mihai Popa [Wed, 6 Jun 2018 19:45:38 +0000 (12:45 -0700)]
[automerger skipped] Merge changes from topic "am-
2d17369d-a241-482f-bad0-
edb5147de00b" into oc-dev am:
3fce74a7f3 -s ours am:
bb18c011aa -s ours am:
7478894a89 -s ours
am:
999d9e1bf0 -s ours
Change-Id: I92c4e0edf71e7f92400395af8aa2828bb9ab395f
TreeHugger Robot [Wed, 6 Jun 2018 19:21:19 +0000 (19:21 +0000)]
Merge "Always cancel clock animation" into pi-dev
TreeHugger Robot [Wed, 6 Jun 2018 19:12:17 +0000 (19:12 +0000)]
Merge "Fix TalkBack do not announce subTitle for NightDisplayTile"
Chavi Weingarten [Wed, 6 Jun 2018 18:56:56 +0000 (18:56 +0000)]
Merge "Prevent IME from showing when AOD shown or windows not drawn." into pi-dev
TreeHugger Robot [Wed, 6 Jun 2018 18:54:51 +0000 (18:54 +0000)]
Merge "media: Check window connect status in ImageWriter" into pi-dev
TreeHugger Robot [Wed, 6 Jun 2018 18:50:52 +0000 (18:50 +0000)]
Merge "Fix PiP regression when the stack animation is canceled" into pi-dev
Rohan Shah [Wed, 6 Jun 2018 18:43:06 +0000 (18:43 +0000)]
Merge "[QS] Change Date font in QQS" into pi-dev
TreeHugger Robot [Wed, 6 Jun 2018 18:33:45 +0000 (18:33 +0000)]
Merge "Wean Statsd off BatteryStats: WakeupAlarm"
TreeHugger Robot [Wed, 6 Jun 2018 18:30:15 +0000 (18:30 +0000)]
Merge "Fix "swipe up to switch apps" pop up displaying in SUW while creating second user." into pi-dev
Julia Reynolds [Mon, 21 May 2018 18:11:43 +0000 (14:11 -0400)]
Allow cross user usage event queries
For multipackage requests, caller must be system uid or hold
interact_across_users if not requesting fate for the same user.
For single package requests, caller must be system uid or the
same package and hold interact_across_users if not requesting data
for the current user.
In both cases the caller must have the usagestats permission.
Test: couldn't find automated tests for this file; manual
Bug:
79142791
Change-Id: I8d650f8e875e0e4578cb48c9ba42e821342852a0
TreeHugger Robot [Wed, 6 Jun 2018 18:18:43 +0000 (18:18 +0000)]
Merge "Changing the recents component to point to launcher3 implementation" into pi-dev
TreeHugger Robot [Wed, 6 Jun 2018 18:18:35 +0000 (18:18 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
Selim Cinek [Wed, 6 Jun 2018 18:18:27 +0000 (18:18 +0000)]
Merge "Fix exception from DateTimeView unregisters receiver again" into pi-dev
TreeHugger Robot [Wed, 6 Jun 2018 18:13:55 +0000 (18:13 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
OSDN Git Service
