Vishnu Nair
2fd4e812bb
Merge "Mark RemoteAnimationControllerTest#testTimeout as flaky" into qt-dev
...
am: 80c94712de
Change-Id: Icc43e96c04f74d9d682f4ace617476eb577e99a5
2019-05-25 00:10:36 -07:00
TreeHugger Robot
80c94712de
Merge "Mark RemoteAnimationControllerTest#testTimeout as flaky" into qt-dev
2019-05-25 06:50:15 +00:00
Chiachang Wang
87237dd665
[automerger skipped] Merge "Update multiple validation result to ConnectivityService" into qt-dev
...
am: 399b7500af -s ours
am skip reason: change_id I243db4c406cca826e803c8035268bc0c6e6e01e2 with SHA1 4532abd4d2 is in history
Change-Id: I09ce684da6680c5c20de4e3f0a7cf741f85131ec
2019-05-24 22:01:20 -07:00
Chiachang Wang
399b7500af
Merge "Update multiple validation result to ConnectivityService" into qt-dev
2019-05-25 04:18:01 +00:00
Bill Yi
d4abcd0f46
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
...
am: 8f1b7c7702 -s ours
am skip reason: subject contains skip directive
Change-Id: Ib011f25791440ba6be99cd4e3f994c423604738b
2019-05-24 19:45:06 -07:00
Kweku Adams
5bb0972346
Merge "Handling race condition when dumping heaps." into qt-dev
...
am: 98876f0727
Change-Id: I37ba96de00db0350a37232eab232ba9b896cfb30
2019-05-24 19:41:24 -07:00
Sudheer Shanka
12d1e428ff
Merge "Temporarily stop killing apps when OP_REQUEST_INSTALL_PACKAGES is denied." into qt-dev
...
am: 789651e201
Change-Id: I624d5a3ec99dc0972b5ea9241fc4cd41eb595bff
2019-05-24 19:26:37 -07:00
Evan Laird
f3b2925416
Merge "Remove channel priority icons from half-shelf" into qt-dev
...
am: 0286f7568b
Change-Id: I85a31efe1ff7872cb74f9ba78c7f9774bd2ea658
2019-05-24 19:18:40 -07:00
TreeHugger Robot
8f1b7c7702
Merge "Import translations. DO NOT MERGE" into qt-dev
2019-05-25 02:14:37 +00:00
Winson Chung
0620646be0
Merge "Add null check for component name when fetching uid" into qt-dev
...
am: 35d6deced8
Change-Id: I46d0c8ee1018b8a72e4191b7b047b0107801d46d
2019-05-24 19:10:35 -07:00
Dianne Hackborn
182d4f692d
Merge "Work on issue #112467931 : APR about content provider without package" into qt-dev
...
am: cb9ba4a310
Change-Id: Ided0d9c43f5e8bbfb481083708515c21c6d70de1
2019-05-24 19:01:35 -07:00
TreeHugger Robot
98876f0727
Merge "Handling race condition when dumping heaps." into qt-dev
2019-05-25 01:24:39 +00:00
Christian Wailes
e5bcf4ba35
Merge "Revert "Adjusts the USAP pool refill mechanism."" into qt-dev-plus-aosp
2019-05-25 00:52:19 +00:00
Mathew Inwood
51c53b4b74
Revert "Adjusts the USAP pool refill mechanism."
...
This reverts commit 0779af6259 .
Reason for revert: Breaks cts SignedConfigHostTest
Note: This CL effectively reverts commit:
54b8d7ea4d
"Make the USAP Pool refill delay configurable."
As that builds on top of the original CL being reverted. Only the
ZygoteServer portion of that change is reverted.
Test: atest SignedConfigHostTest
(on an acloud instance)
Bug: 132794985
Merged-In: I1327a22d103452bed46d191ec2bafb72a5e095ca
Change-Id: I1327a22d103452bed46d191ec2bafb72a5e095ca
2019-05-24 17:42:37 -07:00
Kweku Adams
6cf0ad0404
Merge "Showing battery saver notifications in secondary profiles." into qt-dev
...
am: e666a46e36
Change-Id: Ie1624a41b95350ad874061ebcdd3f77e59543b76
2019-05-24 17:42:22 -07:00
Hyunyoung Song
fdc1c61157
Merge "Add live wallpaper metrics to atoms.proto" into qt-dev
...
am: 2f6110f832
Change-Id: I44a1191b800ee0d50c68ba4439881eb6379bc899
2019-05-24 17:35:35 -07:00
Sudheer Shanka
789651e201
Merge "Temporarily stop killing apps when OP_REQUEST_INSTALL_PACKAGES is denied." into qt-dev
2019-05-25 00:32:52 +00:00
Lucas Dupin
171de819aa
Merge "Remove clock shadows from light mode" into qt-dev
...
am: 88932c42c4
Change-Id: I7207e7629b4a46e4b7d12f92b0ac6cb338fdd134
2019-05-24 17:25:39 -07:00
John Reck
e496882e8f
Merge "Log less" into qt-dev
...
am: 7ede526835
Change-Id: I64811f0ee057b51446b2d1c1e9972631de1494a1
2019-05-24 17:17:29 -07:00
TreeHugger Robot
0286f7568b
Merge "Remove channel priority icons from half-shelf" into qt-dev
2019-05-25 00:07:39 +00:00
TreeHugger Robot
35d6deced8
Merge "Add null check for component name when fetching uid" into qt-dev
2019-05-25 00:05:07 +00:00
Dianne Hackborn
cb9ba4a310
Merge "Work on issue #112467931 : APR about content provider without package" into qt-dev
2019-05-24 23:58:23 +00:00
Mark Renouf
4a72d6df38
Merge "Combine discrete listener methods into single state update" into qt-dev
...
am: a58661397f
Change-Id: I05df374f46e8ad60887a13ed57436987e3cd60c5
2019-05-24 16:54:15 -07:00
TreeHugger Robot
e666a46e36
Merge "Showing battery saver notifications in secondary profiles." into qt-dev
2019-05-24 23:45:57 +00:00
Selim Cinek
71231c42c6
Merge "Ensure smart suggestion background color is updated just after inflation" into qt-dev
...
am: 404bc92bf5
Change-Id: I4c37c944c941ccaefc457fe352cc2c60ff63a090
2019-05-24 16:40:18 -07:00
Julia Reynolds
f3d0764fe3
Merge "Get rid of unnecessary policy file saves" into qt-dev
...
am: ffc7647e57
Change-Id: I69c5eb5ced58b21144c228f1fefac75688b59384
2019-05-24 16:21:22 -07:00
Hyunyoung Song
2f6110f832
Merge "Add live wallpaper metrics to atoms.proto" into qt-dev
2019-05-24 22:43:04 +00:00
Lucas Dupin
88932c42c4
Merge "Remove clock shadows from light mode" into qt-dev
2019-05-24 22:26:50 +00:00
Winson Chung
0edcacb14c
Add null check for component name when fetching uid
...
Bug: 133442663
Test: Bug is not reproducible, but this is just adding a null check
Change-Id: Iaf4231b4b3b1e6e35ab7e7f7cac86a192ad7cd9b
2019-05-24 13:48:55 -07:00
TreeHugger Robot
7ede526835
Merge "Log less" into qt-dev
2019-05-24 20:48:31 +00:00
Bill Yi
954e25d3af
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: Ia8128860891b8d96241e130c3c1a2bbba4243769
2019-05-24 13:24:26 -07:00
Elliott Hughes
efaee402ca
Merge "StrictJarFile can use the new std::string libziparchive Next overload." am: 9fa4e0442c
...
am: d5a3817eef
Change-Id: I7064fd27f43b5e5790e128cc2ed0a753df5da4b7
2019-05-24 13:22:25 -07:00
Elliott Hughes
d5a3817eef
Merge "StrictJarFile can use the new std::string libziparchive Next overload."
...
am: 9fa4e0442c
Change-Id: I31ec9f19d22e5608813ee45b1429647d9858c9ea
2019-05-24 13:11:18 -07:00
Elliott Hughes
9fa4e0442c
Merge "StrictJarFile can use the new std::string libziparchive Next overload."
2019-05-24 19:45:12 +00:00
Sal Savage
d8ff56a96d
[automerger skipped] Merge "Add timestamp and read status extra constants to MAP Client" am: 9dd24d05e9
...
am: b441d2575a -s ours
am skip reason: change_id Ic0f04640f1894d6cf336ba7e641df9cf148a2bbd with SHA1 40aa11ead0 is in history
Change-Id: I9045ab97723e5c0a83af2df0729c50dab753f97d
2019-05-24 12:42:52 -07:00
Hall Liu
55bc95f8d0
Merge "Stop silently dropping a NullPointerException" am: d99ca07884
...
am: 66c4dc0757
Change-Id: I6fb1b41660b61c83a1f6883df823d2840f974de3
2019-05-24 12:36:42 -07:00
Paul Mclean
e64fd38ce2
Merge "Revert "Fix incorrect parsing of UVC interface descriptor"" am: 8863583ffa
...
am: 40f44f5d4a
Change-Id: If09ce3e9a5da7a357b883f119bbf2d0ed2385ade
2019-05-24 12:30:41 -07:00
Sal Savage
b441d2575a
Merge "Add timestamp and read status extra constants to MAP Client"
...
am: 9dd24d05e9
Change-Id: I5a1e75de9369fa05f0974523c97e093622b330c6
2019-05-24 12:08:24 -07:00
Hall Liu
66c4dc0757
Merge "Stop silently dropping a NullPointerException"
...
am: d99ca07884
Change-Id: I11e76cf1174057e2178f52faeae8e225062d1488
2019-05-24 12:03:32 -07:00
Paul Mclean
40f44f5d4a
Merge "Revert "Fix incorrect parsing of UVC interface descriptor""
...
am: 8863583ffa
Change-Id: Ifb74f24bba3160b7111c5d03f1a0a646592f53ae
2019-05-24 11:57:56 -07:00
Sudheer Shanka
acbba9e681
Temporarily stop killing apps when OP_REQUEST_INSTALL_PACKAGES is denied.
...
Need to update tests which toggle this appop as part of the tests
before changing this behavior.
Bug: 133481508
Test: atest com.google.android.packageinstaller.install.gts.SessionTest
Change-Id: I59ef56e4e0a559ab42081ea1343799afbfd64e0e
2019-05-24 11:35:17 -07:00
Mark Renouf
a58661397f
Merge "Combine discrete listener methods into single state update" into qt-dev
2019-05-24 18:32:51 +00:00
Sal Savage
9dd24d05e9
Merge "Add timestamp and read status extra constants to MAP Client"
2019-05-24 18:29:43 +00:00
Hall Liu
d99ca07884
Merge "Stop silently dropping a NullPointerException"
2019-05-24 18:27:44 +00:00
Treehugger Robot
8863583ffa
Merge "Revert "Fix incorrect parsing of UVC interface descriptor""
2019-05-24 18:20:25 +00:00
Selim Cinek
404bc92bf5
Merge "Ensure smart suggestion background color is updated just after inflation" into qt-dev
2019-05-24 18:13:55 +00:00
Julia Reynolds
ffc7647e57
Merge "Get rid of unnecessary policy file saves" into qt-dev
2019-05-24 18:13:05 +00:00
Brad Ebinger
499881f1da
Merge "Add CAPABILITY_EMERGENCY_PREFERRED in PhoneAccount" into qt-dev
...
am: a105253ea8
Change-Id: If70d917cfb3d825f375d282012b8788d69a2f144
2019-05-24 11:01:15 -07:00
Bin Chen
f752a6a86b
Merge "[Magnifier-86] Fix deadlock causing ANR" into qt-dev
...
am: 0c7e69bdb6
Change-Id: Ib71dc3887e7501aa6a3abc71f0d23d2c6f5a32c5
2019-05-24 10:53:45 -07:00
Brad Ebinger
a105253ea8
Merge "Add CAPABILITY_EMERGENCY_PREFERRED in PhoneAccount" into qt-dev
2019-05-24 17:45:47 +00:00