OSDN Git Service
Yi Jin [Thu, 7 Jun 2018 17:06:54 +0000 (10:06 -0700)]
Merge "Fix cts." into pi-dev
am:
3e389a8490
Change-Id: I77fcff1e83f33859e0b0cb65a29bfa40827749a9
Yi Jin [Thu, 7 Jun 2018 16:48:20 +0000 (16:48 +0000)]
Merge "Fix cts." into pi-dev
Andrew Sapperstein [Thu, 7 Jun 2018 16:29:35 +0000 (09:29 -0700)]
Merge "Revert "Hide system apps until installed (1/2)"" into pi-dev
am:
bae9b1a71c
Change-Id: If57cc74f41f7294780c0f6f3d534b1c7af877d38
Andrew Sapperstein [Thu, 7 Jun 2018 16:15:57 +0000 (16:15 +0000)]
Merge "Revert "Hide system apps until installed (1/2)"" into pi-dev
Nicolas Geoffray [Thu, 7 Jun 2018 15:29:48 +0000 (08:29 -0700)]
Merge "Manual update from a bugbot hidden API comment." into pi-dev
am:
cc2cbe8dc8
Change-Id: I4b817ff598eea893eb78d9fdfd7f322176850cc2
Nicolas Geoffray [Thu, 7 Jun 2018 15:18:24 +0000 (15:18 +0000)]
Merge "Manual update from a bugbot hidden API comment." into pi-dev
Daniel Sandler [Thu, 7 Jun 2018 14:23:27 +0000 (07:23 -0700)]
Merge "O no, this should be a P." into pi-dev
am:
31cb11324f
Change-Id: I7392d863c935ab64fc6445fca4c3b35352ffcf1f
Daniel Sandler [Thu, 7 Jun 2018 14:14:03 +0000 (14:14 +0000)]
Merge "O no, this should be a P." into pi-dev
Nicolas Geoffray [Thu, 7 Jun 2018 10:50:02 +0000 (11:50 +0100)]
Manual update from a bugbot hidden API comment.
bug:
109761368
Test: m
Change-Id: I65cda12a0c4e48c888d3b08f63f9412b88ac248a
Ryan Mitchell [Thu, 7 Jun 2018 06:05:27 +0000 (23:05 -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: I91dddfd8a038bcd353769b7173e2864caab2d046
Ryan Mitchell [Thu, 7 Jun 2018 05:52:56 +0000 (22:52 -0700)]
Merge changes from topic "am-
c1e91e5e-2686-4871-b188-
107c0ddf3273" into oc-dev am:
075bcf73c8 am:
dff068e1e8 am:
366031e336
am:
5dcf0e0f65
Change-Id: I5caded1c61d9e0a45b9aaa4db37493b2cd1a6c2b
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
Dan Sandler [Thu, 7 Jun 2018 05:08:34 +0000 (01:08 -0400)]
O no, this should be a P.
Bug:
109804872
Test: none
Change-Id: Ibd6aac069a254a7d5a190e1f4476ba2c4124a758
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
Felipe Leme [Thu, 7 Jun 2018 02:03:05 +0000 (19:03 -0700)]
Merge "Document -n option on intent specification." into pi-dev
am:
39f04a7da4
Change-Id: Ida1118dcb4690b9e5067ee781d2b32131231681c
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
Winson Chung [Thu, 7 Jun 2018 01:53:11 +0000 (18:53 -0700)]
Merge "Skip finishing menu activity when dismissing PiP" into pi-dev
am:
fc16950683
Change-Id: I8f84ad12fb662e2b5d97b4de118697dadb51bac8
Amith Yamasani [Thu, 7 Jun 2018 01:44:08 +0000 (18:44 -0700)]
Merge "DO NOT MERGE Fix security exception due to incorrect flags" into pi-dev
am:
9f1885dee8
Change-Id: I292370dc2fcf4b33e42c5a97a9d5d5bacfe0def8
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
Yi Jin [Thu, 7 Jun 2018 01:08:01 +0000 (18:08 -0700)]
Fix cts.
Bug:
109837886
Test: atest CtsIncidentHostTestCases:com.android.server.cts.IncidentdTest
Change-Id: I8cfc36b652fff4b7b4d752f57fba922ac479cd12
Felipe Leme [Thu, 7 Jun 2018 01:06:47 +0000 (18:06 -0700)]
Merge "Minor autofill logging improvements." into pi-dev
am:
125c19a2f5
Change-Id: I99a127c2f17284f6aeefd19814779c17a46f5bfd
Nan Zhang [Thu, 7 Jun 2018 00:41:49 +0000 (17:41 -0700)]
Merge "Add metalava-api-stubs targets" into pi-dev
am:
a08d1ffbb7
Change-Id: I87d04989509b96eeb8d97fcbdfb1102c55b0d8f8
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
Ryan Mitchell [Thu, 7 Jun 2018 00:35:24 +0000 (17:35 -0700)]
Merge "Fix DynamicRefTable::load security bug" into oc-mr1-dev am:
2b6805fedc
am:
5ae85666ac
Change-Id: I32a1adb783012b0d799aa849f2f989377d3cdbad
Mihai Popa [Wed, 6 Jun 2018 23:57:53 +0000 (16:57 -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: I66a97b7defc39ec06069dcea88d1a19aa5123d90
Evan Laird [Wed, 6 Jun 2018 23:45:10 +0000 (16:45 -0700)]
Merge "Status bar etc dots 4dp" into pi-dev
am:
d54c3a3036
Change-Id: I9038fb861e7a543f7082c4b186f0c77eb352e204
Dieter Hsu [Wed, 6 Jun 2018 23:41:05 +0000 (16:41 -0700)]
Merge "Update notifications on density or font size change for current user" into pi-dev
am:
1394b342e3
Change-Id: I21abde95764da24626a6c367465df7f8e653119e
Lucas Dupin [Wed, 6 Jun 2018 23:36:36 +0000 (16:36 -0700)]
Merge "Always cancel clock animation" into pi-dev
am:
a1cb973366
Change-Id: Ic90bb71af6578e3519f8bc72fa45693b76a0860b
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
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
Chavi Weingarten [Wed, 6 Jun 2018 23:31:49 +0000 (16:31 -0700)]
Merge "Prevent IME from showing when AOD shown or windows not drawn." into pi-dev
am:
cf5514257f
Change-Id: I96d4882d471f7ffd81625ea649ac4cd7442cf2b7
Emilian Peev [Wed, 6 Jun 2018 23:27:37 +0000 (16:27 -0700)]
Merge "media: Check window connect status in ImageWriter" into pi-dev
am:
596fea9581
Change-Id: I6bcd4b23b0db6c8efeb40d22bda97f675da09a2b
Winson Chung [Wed, 6 Jun 2018 23:22:40 +0000 (16:22 -0700)]
Merge "Fix PiP regression when the stack animation is canceled" into pi-dev
am:
19cfc1a754
Change-Id: Ic0aba5ae584185b75ca7c7c0fd8e0426b401f022
Rohan Shah [Wed, 6 Jun 2018 23:18:32 +0000 (16:18 -0700)]
Merge "[QS] Change Date font in QQS" into pi-dev
am:
c754707b76
Change-Id: Ib16afb12e3435fcc0f6db6d3154a789cba0a374e
TreeHugger Robot [Wed, 6 Jun 2018 23:06:28 +0000 (23:06 +0000)]
Merge "Minor autofill logging improvements." into pi-dev
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
Tracy Zhou [Wed, 6 Jun 2018 22:40:42 +0000 (15:40 -0700)]
Merge "Fix "swipe up to switch apps" pop up displaying in SUW while creating second user." into pi-dev
am:
dd12d33981
Change-Id: If382a57e958308d097d3eb55326f3c3eec3785e2
Sunny Goyal [Wed, 6 Jun 2018 22:16:52 +0000 (15:16 -0700)]
Merge "Changing the recents component to point to launcher3 implementation" into pi-dev
am:
09dc071562
Change-Id: I026ba2135544c06573161edae0ccbca2f22fe379
TreeHugger Robot [Wed, 6 Jun 2018 22:16:36 +0000 (22:16 +0000)]
Merge "Fix DynamicRefTable::load security bug" into oc-mr1-dev
Bill Yi [Wed, 6 Jun 2018 22:10:32 +0000 (15:10 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am:
6824fdb401 -s ours
Change-Id: Ide2923656fb10c930f937637d0498e33b1f762a7
Selim Cinek [Wed, 6 Jun 2018 22:10:07 +0000 (15:10 -0700)]
Merge "Fix exception from DateTimeView unregisters receiver again" into pi-dev
am:
a2537b7269
Change-Id: I40d6d770656bffda13aa1712a8680723c680d457
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
Bill Yi [Wed, 6 Jun 2018 22:06:06 +0000 (15:06 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am:
891fa6f6af -s ours
Change-Id: I86f2b66c90f63ccde66d604122d8cae142cc0b09
Bill Yi [Wed, 6 Jun 2018 22:05:13 +0000 (15:05 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am:
d3e66495cd -s ours
Change-Id: Ibecf961ddfedf73aaa1ae3d351efaaad1f148253
Bill Yi [Wed, 6 Jun 2018 22:04:45 +0000 (15:04 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am:
158e38c3ed -s ours
Change-Id: I4149472c8d9fce00259d1c6a4e5f8ca77c512169
Nicolas Geoffray [Wed, 6 Jun 2018 22:04:10 +0000 (15:04 -0700)]
Merge "Light grey bugbot updates." into pi-dev
am:
bfa0ee12cf
Change-Id: Ie3e476301539c90504afe49751eec2340073fcb1
Mihai Popa [Wed, 6 Jun 2018 22:00:07 +0000 (15:00 -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: I528540470320fbd8d67a8ea15293c592e5864cf6
Rebecca Silberstein [Wed, 6 Jun 2018 21:42:45 +0000 (14:42 -0700)]
Merge "WifiManager: add call to see if apband conversion is required" into pi-dev
am:
85bdd711ce
Change-Id: I5678f8bacda3a4bdff4c966ff60b86d922c3bd31
Julia Reynolds [Wed, 6 Jun 2018 21:38:46 +0000 (14:38 -0700)]
Merge "Use correct attribute name." into pi-dev
am:
65a411ac45
Change-Id: Ibb2463b9d303347c34d8e1aeeb9275912136db2d
Jean-Michel Trivi [Wed, 6 Jun 2018 21:34:40 +0000 (14:34 -0700)]
Merge "AudioRecord JNI: fix mem leak on audio_attributes_t" into pi-dev
am:
2e73ff5e6f
Change-Id: I55f799ed8b441eaf9baa2587d0a2fddf72b3a150
Winson Chung [Wed, 6 Jun 2018 21:28:48 +0000 (14:28 -0700)]
Merge "Expose the source component which launched this task." into pi-dev
am:
b4e4fc3a1e
Change-Id: Ib368be0c77d9f62bd2892f8d909d184cf346b2cf
Calin Juravle [Wed, 6 Jun 2018 21:24:46 +0000 (14:24 -0700)]
Merge "Remove sun.nio.fs.UnixChannelFactory from preloaded-classes" into pi-dev
am:
d8269005fe
Change-Id: I717850f6e1f9bf48661403b31f9e709fcbb668e2
TreeHugger Robot [Wed, 6 Jun 2018 21:21:37 +0000 (21:21 +0000)]
Merge "Status bar etc dots 4dp" into pi-dev
Evan Laird [Wed, 6 Jun 2018 21:20:39 +0000 (14:20 -0700)]
Merge "Consider icon scale when calculating icon offset in shelf" into pi-dev
am:
00c132cd35
Change-Id: Ib09a1f9586e9b72c5c4d80c098476bc19807998e
Evan Laird [Wed, 6 Jun 2018 21:16:36 +0000 (14:16 -0700)]
Merge "Wi-Fi, now corporeal!" into pi-dev
am:
bc6f64d557
Change-Id: I73de6c26f631c205cd14d3463e8c2158fb56fdd7
Svet Ganov [Wed, 6 Jun 2018 21:12:18 +0000 (14:12 -0700)]
Merge "Allow instant apps to send broadcasts to themselves" into pi-dev
am:
93ec4f829d
Change-Id: Ifde8c09986112c4655f6843ece7d6bb924b3086d
Clara Bayarri [Wed, 6 Jun 2018 21:07:54 +0000 (14:07 -0700)]
Merge "Fix repeated calls into reportExtractedText" into pi-dev
am:
bcbdeb29c9
Change-Id: I8a468c05b91712e0e77ab7ce0da1a93aa25d083d
Lorenzo Colitti [Wed, 6 Jun 2018 21:02:45 +0000 (14:02 -0700)]
Merge "Support seamless handover between VPN fds." into pi-dev
am:
f35fd8653c
Change-Id: I69192f77a3faf93e6e799843d0da6241ff9f396f
Julia Reynolds [Wed, 6 Jun 2018 20:58:35 +0000 (13:58 -0700)]
Merge "Further interruptiveness changes" into pi-dev
am:
fe1d9dc1af
Change-Id: I10f9880039772734647c8a3584916b922c0d0e27
chaviw [Wed, 6 Jun 2018 20:54:37 +0000 (13:54 -0700)]
Merge "Notify WM that app is delayed closing due to the possibility of PIP." into pi-dev
am:
47d9d9801b
Change-Id: I261b8c92c63af6158b4609f9b3f8d4a2c2ad1d89
Nicolas Geoffray [Wed, 6 Jun 2018 20:50:18 +0000 (13:50 -0700)]
Add 3 more APIs to light grey.
am:
1bb35c2a21
Change-Id: I9c6232ff9283b00fd4c99e5f3eeaa1ab0b56ca2a
Junyu Lai [Wed, 6 Jun 2018 20:48:16 +0000 (13:48 -0700)]
Merge "Copy clat modified linkProperties into new one." into pi-dev
am:
183ec8ee35
Change-Id: I61076b5344157f0ec04086c8911fd0b1187f9a76
Martijn Coenen [Wed, 6 Jun 2018 20:44:03 +0000 (13:44 -0700)]
Merge "Serialize calls into BinderProxy." into pi-dev
am:
051b63d4b3
Change-Id: I1e3b71954ca098920564de33ef2d494093abda49
Erik Kline [Wed, 6 Jun 2018 20:39:34 +0000 (13:39 -0700)]
Merge "Randomize the local Wifi IPv4 address" into pi-dev
am:
046bb433c7
Change-Id: I0e93f908dedebb34fb3ccc3da8f8dc3f938b256f
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
Todd Kennedy [Wed, 6 Jun 2018 20:35:18 +0000 (13:35 -0700)]
Merge "Allow instant apps to launch instant apps" into pi-dev
am:
a4155c751f
Change-Id: I534cc8adaa83de0334fd9e44d313cd069c901561
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
Eugene Susla [Wed, 6 Jun 2018 20:31:13 +0000 (13:31 -0700)]
Merge "Fix DefaultPermissionGrantPolicyTest" into pi-dev
am:
536cb9c426
Change-Id: I28e10e91539833568dcc71dba0a56c53937def13
Akinobu Nakashima [Wed, 6 Jun 2018 20:27:09 +0000 (13:27 -0700)]
Merge "Suppress AID log on adb logcat" into pi-dev
am:
96e843bbcc
Change-Id: I34d379657472978da243a1eb65a8967cf42679ab
Atanas Kirilov [Wed, 6 Jun 2018 20:20:31 +0000 (13:20 -0700)]
[automerger skipped] Merge changes from topic "am-
f5dc500e-4d32-4849-891e-
c618cef666de" into oc-dev am:
c3b4881ea5 am:
4f74605d11 am:
94fbd36ef8 -s ours
am:
7e4faf89ec -s ours
Change-Id: Ia798a5f8a3e9459f0171e3108e67deb2ecf5815e
Felipe Leme [Wed, 6 Jun 2018 20:10:43 +0000 (13:10 -0700)]
Merge "Log FIELD_AUTOFILL_SESSION_ID as string." into pi-dev
am:
efa585d96a
Change-Id: I6ee5a2e6e277819cc7d2166f4ab52757441cbd37
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
Sanry Huang [Wed, 6 Jun 2018 17:34:34 +0000 (17:34 +0000)]
Revert "Hide system apps until installed (1/2)"
This reverts commit
40ede29ed6467d4d85a482e6008b92aa02d50267.
Bug:
74068582
Bug:
80444486
Bug:
80316870
Bug:
109803325
Bug:
109642189
Bug:
109660260
Bug:
109649585
Bug:
109647120
Bug:
109648512
Bug:
109648513
Bug:
109647122
Change-Id: I0e50ceebeaecae89f461f541450e24d9c148527d
TreeHugger Robot [Wed, 6 Jun 2018 19:21:19 +0000 (19:21 +0000)]
Merge "Always cancel clock animation" into pi-dev
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: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
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
TreeHugger Robot [Wed, 6 Jun 2018 18:13:27 +0000 (18:13 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
Mihai Popa [Wed, 6 Jun 2018 18:09:15 +0000 (11:09 -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
Change-Id: Ic5ff6005483d4f4af1d0b9d8547c00751942fada
TreeHugger Robot [Wed, 6 Jun 2018 18:04:41 +0000 (18:04 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
Dieter Hsu [Wed, 6 Jun 2018 07:41:46 +0000 (15:41 +0800)]
Update notifications on density or font size change for current user
For created notifications, entry manager is not going to update entries
after changing the font scale and/or display density when shade is
disabled or other reasons.
To reinflate notifications for current user even filtered.
Fixes:
77728867
Test: manually restore backup with lots of apps and change font scale and/or display density
Test: atest SystemUITests:NotificationDataTest
Change-Id: I37fa38e73af1ebb672abd06282d10d7d928cc3a9
TreeHugger Robot [Wed, 6 Jun 2018 17:51:32 +0000 (17:51 +0000)]
Merge "Light grey bugbot updates." into pi-dev
Mihai Popa [Wed, 6 Jun 2018 17:42:20 +0000 (10:42 -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
Change-Id: I22992503b6a99f7002d0ce440d4fda9e313bcf73
Android Build Merger (Role) [Wed, 6 Jun 2018 17:13:15 +0000 (17:13 +0000)]
[automerger] Fix DynamicRefTable::load security bug am:
8cf0f988b0 am:
d65dbf91ce am:
aeb2fc64d9 am:
0938689606 am:
6f76fbfc69 am:
69b14d2a1a am:
c7e3991628 am:
c3aa2a4d3f am:
648a950ce9
Change-Id: I313ac2c564ba5c8f094a37160d9ac5198f1d5aea
Android Build Merger (Role) [Wed, 6 Jun 2018 17:13:01 +0000 (17:13 +0000)]
[automerger] Fix DynamicRefTable::load security bug am:
8cf0f988b0 am:
d65dbf91ce am:
aeb2fc64d9 am:
0938689606 am:
6f76fbfc69 am:
69b14d2a1a am:
c7e3991628 am:
c3aa2a4d3f
Change-Id: I2d0676d161e47b400d110c3239cdaaf002c72ec3
Android Build Merger (Role) [Wed, 6 Jun 2018 17:12:53 +0000 (17:12 +0000)]
[automerger] Fix DynamicRefTable::load security bug am:
8cf0f988b0 am:
d65dbf91ce am:
aeb2fc64d9 am:
0938689606 am:
6f76fbfc69 am:
69b14d2a1a am:
c7e3991628
Change-Id: Ia7adde45bd85d2b3a56ede7215732cc05d97d870
Android Build Merger (Role) [Wed, 6 Jun 2018 17:12:46 +0000 (17:12 +0000)]
[automerger] Fix DynamicRefTable::load security bug am:
8cf0f988b0 am:
d65dbf91ce am:
aeb2fc64d9 am:
0938689606 am:
6f76fbfc69 am:
69b14d2a1a
Change-Id: I6e7ab766f6c88e61b8c2993a2f1420efc177319a
Android Build Merger (Role) [Wed, 6 Jun 2018 17:12:39 +0000 (17:12 +0000)]
[automerger] Fix DynamicRefTable::load security bug am:
8cf0f988b0 am:
d65dbf91ce am:
aeb2fc64d9 am:
0938689606 am:
6f76fbfc69
Change-Id: I43c9c68ca69d26f6d4d2dee3cd2a66d5e4a73761
OSDN Git Service
