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
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
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
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
TreeHugger Robot
7ede526835
Merge "Log less" into qt-dev
2019-05-24 20:48:31 +00: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
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
Paul Mclean
341f0934a2
Revert "Fix incorrect parsing of UVC interface descriptor"
...
This reverts commit b83cf0c7f1 .
Reason for revert: This changes breaks connection to ALL USB Audio interface. Camera audio should be investigat
Bug: 124374863
Bug: 133501871
Change-Id: I19fed05c0b5f4227f88df3ac17ddd5ebe4246f3d
2019-05-24 17:34:32 +00:00
Julia Reynolds
422b9550f7
Merge "Allow notifs from the default sms app to be blocked" into qt-dev
...
am: aa0eeb3857
Change-Id: Ia05ab6c68b4734dfaa4016b6b06f2c8305be56ff
2019-05-24 10:27:35 -07:00
Yao Chen
303c8f3ea3
Merge "Statsd: apex modules in uid map" into qt-dev
...
am: a36325306a
Change-Id: I0f474e569273ba6a56fe22d6786649b7e87b6721
2019-05-24 10:20:54 -07:00
TreeHugger Robot
0c7e69bdb6
Merge "[Magnifier-86] Fix deadlock causing ANR" into qt-dev
2019-05-24 17:03:21 +00:00
Julia Reynolds
aa0eeb3857
Merge "Allow notifs from the default sms app to be blocked" into qt-dev
2019-05-24 17:00:12 +00:00
Yao Chen
a36325306a
Merge "Statsd: apex modules in uid map" into qt-dev
2019-05-24 16:48:28 +00:00
Mihai Popa
b82fd2d7d3
Merge "[Magnifier-84] Improve PixelCopy failures handling" into qt-dev
...
am: 612f71b1df
Change-Id: Id5b3d1a582d7119b2a967e6759d0e8e939ff20c8
2019-05-24 09:32:04 -07:00
Josh Tsuji
f37743e533
Merge "Align bubble behavior with DND settings." into qt-dev
...
am: 520ba6438a
Change-Id: Ieaf1e69f7c2e4d2c20b98c05992d4368a5a83d92
2019-05-24 09:24:45 -07:00
Mihai Popa
612f71b1df
Merge "[Magnifier-84] Improve PixelCopy failures handling" into qt-dev
2019-05-24 15:45:38 +00:00
Josh Tsuji
520ba6438a
Merge "Align bubble behavior with DND settings." into qt-dev
2019-05-24 15:38:02 +00:00
mrcasey
2b0255c60d
Merge "Update sysui OWNERS" am: 053905656c
...
am: 2d525eece3
Change-Id: I558623e1eee88ee6db073315cb1b1bbeefe5676f
2019-05-24 07:51:34 -07:00
mrcasey
2d525eece3
Merge "Update sysui OWNERS"
...
am: 053905656c
Change-Id: I561e2b4f8374ddfc20ab562572cfa7803a770f68
2019-05-24 07:41:02 -07:00
Julia Reynolds
996c7c1357
Get rid of unnecessary policy file saves
...
The policy file was being saved twice per mPackageIntentReceiver
and most of the time no permanent settings are changed in response
to this broadcast.
Test: monitor logs after changing app timers for an app
Bug: 133131877
Change-Id: I0c89e785aa2421fa499e488fc583ab5db71d6010
2019-05-24 10:25:33 -04:00
mrcasey
053905656c
Merge "Update sysui OWNERS"
2019-05-24 14:25:20 +00:00
Tao Bao
ae4270e679
Merge "Write system property persist.sys.provisioned" into qt-dev
...
am: 731490a142
Change-Id: Idb23b9f7b3aae0836ed701918fa36084953cf343
2019-05-24 07:21:21 -07:00
Tao Bao
731490a142
Merge "Write system property persist.sys.provisioned" into qt-dev
2019-05-24 14:06:15 +00:00
Mark Renouf
82a40e6ecd
Combine discrete listener methods into single state update
...
This will enable BubbleStackView to apply a set of changes more
intelligently and to more easily set up the correct animations in
response.
Test: atest BubbleDataTest
Bug: 123542488
Change-Id: Ie83b4eeca2d66953141d701780cf3037830c1b31
2019-05-24 09:43:13 -04:00