Leon Scroggins
bc4e5c6c66
Merge "AImageDecoder: only support animation for F16 and 8888 (impl)" into sc-dev
2021-04-27 19:22:23 +00:00
Brad Ebinger
33866688e6
Merge "Add String Map for Message Failure causes" am: 53c985aa19 am: 1dc1e1af79 am: c812be6147
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1663522
Change-Id: Ib3a55d55d5359ed02b6e04722f68f25fc19bbaff
2021-04-27 18:56:05 +00:00
TreeHugger Robot
1632dd9610
Merge changes Id51293db,Ib7586997 into sc-dev
...
* changes:
Tests for media player on the left side on lockscreen in split shade mode
Moving media player in split shade mode on the lockscreen to the left side
2021-04-27 18:41:29 +00:00
Brad Ebinger
c812be6147
Merge "Add String Map for Message Failure causes" am: 53c985aa19 am: 1dc1e1af79
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1663522
Change-Id: I136fbd995ab64709ae15cb1a89e18d53895685ea
2021-04-27 18:36:28 +00:00
Fabian Kozynski
c28fe4101f
Merge "New SecurityFooter design" into sc-dev
2021-04-27 18:28:32 +00:00
Cecilia Hong
602b54fd4c
Merge "Add click logging for Smartspace media recommendation card." into sc-dev
2021-04-27 18:24:41 +00:00
Brad Ebinger
1dc1e1af79
Merge "Add String Map for Message Failure causes" am: 53c985aa19
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1663522
Change-Id: I648379c0fc0eada85ced2eca1b91bcbc063a5c9d
2021-04-27 18:15:02 +00:00
TreeHugger Robot
f10473c64c
Merge "Fix NPE on VibratorInfo.getPrimitiveDuration" into sc-dev
2021-04-27 18:12:51 +00:00
Steven Moreland
8fad5d86b9
Merge "libhwui: AnimatedImageThread - UAF" into sc-dev
2021-04-27 18:12:32 +00:00
David Drysdale
390dbd728a
Merge "Align KeyMint AIDL with usage" am: 6b8f292b17 am: eb393d45f0 am: 3a19c2f0fc
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1682041
Change-Id: I49b837ec97c427131c40fe9a4b88d5383cceb65b
2021-04-27 18:06:44 +00:00
TreeHugger Robot
89126b252c
Merge "Add debug log for showSoftInput" into sc-dev
2021-04-27 18:02:04 +00:00
Ilya Matyukhin
bbddf477af
Merge changes I165d67bd,I4442db15 into sc-dev
...
* changes:
Notify AuthController when fingerprint providers are ready
Consolidate registration of HIDL and AIDL HALs
2021-04-27 17:50:35 +00:00
Brad Ebinger
53c985aa19
Merge "Add String Map for Message Failure causes"
2021-04-27 17:47:22 +00:00
David Drysdale
3a19c2f0fc
Merge "Align KeyMint AIDL with usage" am: 6b8f292b17 am: eb393d45f0
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1682041
Change-Id: I0fac9054cf9432bdac30fe3d4b4934b1dae5c61f
2021-04-27 17:41:13 +00:00
Siim Sammul
909042e9a4
Merge "Enable binder latency collection from system_server for dogfood." into sc-dev
2021-04-27 17:32:02 +00:00
TreeHugger Robot
31cb707f00
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: db64c6d9a6 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14325871
Change-Id: I2ebb9787834b81299e4902a1e369b3adc7986b09
2021-04-27 17:25:17 +00:00
David Drysdale
eb393d45f0
Merge "Align KeyMint AIDL with usage" am: 6b8f292b17
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1682041
Change-Id: Ifbfee047de1cd0abb68723ede408658286cfae0a
2021-04-27 17:12:14 +00:00
TreeHugger Robot
564ef6e7e0
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: d26d62e3af -s ours am: cb2afcb262 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14325872
Change-Id: I1d2e8519be7f70fb7ca7168317cad42fee9ccf65
2021-04-27 17:10:24 +00:00
Mady Mellor
95de12ed62
Merge "Bubbles: improve how rotation is listened for" into sc-dev
2021-04-27 17:08:19 +00:00
Chavi Weingarten
7131ac5913
Merge "Added takeScreenshot of a Window to UiAutomation" into sc-dev
2021-04-27 17:06:14 +00:00
TreeHugger Robot
cb2afcb262
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: d26d62e3af -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14325872
Change-Id: Ibd36d65363c09ca56ef724b3aca6021d8670c6b2
2021-04-27 16:45:01 +00:00
David Drysdale
6b8f292b17
Merge "Align KeyMint AIDL with usage"
2021-04-27 16:43:01 +00:00
Hui Wang
ddcd076c78
Merge "Support to search by characteristic for rcs provisioning config" into sc-dev
2021-04-27 16:30:19 +00:00
TreeHugger Robot
db64c6d9a6
Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod
2021-04-27 16:25:27 +00:00
Santiago Seifert
7c8f0cb884
Merge "Add log session id to MediaParser" into sc-dev
2021-04-27 16:19:40 +00:00
TreeHugger Robot
d26d62e3af
Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev
2021-04-27 16:15:17 +00:00
Nate Myren
c0515e8017
Merge "Enable immersive indicator by default" into sc-dev
2021-04-27 16:09:58 +00:00
cecilia
38516f85cb
Add click logging for Smartspace media recommendation card.
...
This change is originally added in ag/14271917, but accidentally removed by ag/14188374 for a merge conflict > <.
Test: statsd_testdrive output https://paste.googleplex.com/5438521440468992
Bug: 181364757
Change-Id: Ic848fe38afef252595ac2f17841e663cd634a33d
2021-04-27 16:09:54 +00:00
Chris Ye
167b01edf8
Merge "Add Builder to LightState." into sc-dev
2021-04-27 16:06:12 +00:00
TreeHugger Robot
cbfb5f4584
Merge "[SettingsProvider] hide ALWAYS_ON_VPN_APP" into sc-dev
2021-04-27 16:04:26 +00:00
Michal Brzezinski
89bd618dcb
Tests for media player on the left side on lockscreen in split shade mode
...
Bug: 181882240
Test: atest KeyguardMediaControllerTest KeyguardClockPositionAlgorithmTest NotificationPanelViewTest
Change-Id: Id51293dbd134ea45ed0084a89f2da48136599168
2021-04-27 15:56:52 +00:00
Marin Shalamanov
deb3ccf048
Merge "Update javadoc for setFrameRate" into sc-dev
2021-04-27 15:56:08 +00:00
Michal Brzezinski
4e0bac8243
Moving media player in split shade mode on the lockscreen to the left side
...
Bug: 181882240
Test: manual
Change-Id: Ib75869971168b3a514b961262ee8a02659f8ae74
2021-04-27 15:51:37 +00:00
Dave Mankoff
e2f08225e9
Merge "Add falsing check to UserDetailView" into sc-dev
2021-04-27 15:39:52 +00:00
TreeHugger Robot
6ddf4030bb
[automerger skipped] Merge "Restrict alarm broadcast" into rvc-dev am: a432e5ca8e -s ours am: e7e38728c1 -s ours am: 67a36f0248 -s ours
...
am skip reason: skip tag Change-Id I4f8e56729d90f8f5288d08881129b1c45d5790e7 with SHA-1 4056976f1e is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14102043
Change-Id: I8d9214f65633bb4fe9b7b8652fa7380e10580624
2021-04-27 15:35:46 +00:00
Lucas Dupin
d768970034
Merge "Don't animate depth when changing brightness" into sc-dev
2021-04-27 15:25:17 +00:00
Ming-Shin Lu
b7e4b7c279
Add debug log for showSoftInput
...
As CL[1] added the reason field in showSoftInput to expose where the
show request comes from.
Refine the original showSoftInput debug log from CL[2] to add the
reason for helping the issue clarification.
[1]: I390dc029e7bcc30c200926a9bfbbbd0268a1f714
[2]: I67a790f9d98d6131aaf04e4bb98d2a28873d3424
Bug: 182071625
Bug: 171827834
Test: adb logcat -s InputMethodManager:D
Change-Id: I73ab4e2b856669b6b6922ee451da1819e5ca18f4
2021-04-27 23:22:54 +08:00
TreeHugger Robot
17ea96943a
[automerger skipped] Merge "Restrict alarm broadcast" into rvc-dev am: a432e5ca8e am: 95d2b626db -s ours
...
am skip reason: skip tag Change-Id I4f8e56729d90f8f5288d08881129b1c45d5790e7 with SHA-1 1c08e32233 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14102043
Change-Id: I36507b6fd78dbcb012c8600a1886d1a53f271d40
2021-04-27 15:20:00 +00:00
Nate Myren
2af054a29f
Merge "Add Executor to Permission Group methods in PermissionControllerManager" into sc-dev
2021-04-27 15:18:06 +00:00
TreeHugger Robot
49b78296ed
Merge "Fix wallpaper scaling issues" into sc-dev
2021-04-27 15:13:31 +00:00
Fabian Kozynski
c9b449e79d
Merge "Improve log of paused items in PrivacyItemController" into sc-dev
2021-04-27 15:11:09 +00:00
TreeHugger Robot
67a36f0248
[automerger skipped] Merge "Restrict alarm broadcast" into rvc-dev am: a432e5ca8e -s ours am: e7e38728c1 -s ours
...
am skip reason: skip tag Change-Id I4f8e56729d90f8f5288d08881129b1c45d5790e7 with SHA-1 1c08e32233 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14102043
Change-Id: I4aa6382bdaaea545891f44eea49316b78e3ef5f2
2021-04-27 15:08:58 +00:00
Bill Yi
ea8294807a
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev
2021-04-27 14:56:57 +00:00
Bill Yi
b5201be1d2
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev
2021-04-27 14:56:49 +00:00
Jamie Garside
8d3ce701b1
Merge "Move bouncer to bottom of screen when in one handed mode." into sc-dev
2021-04-27 14:55:50 +00:00
Lais Andrade
a97407bcc8
Fix NPE on VibratorInfo.getPrimitiveDuration
...
Fix: 186469012
Test: VibratorInfoTest
Change-Id: I2145bd95ad23040a583a347e9a1f4cff2a40e8c2
2021-04-27 14:55:45 +00:00
TreeHugger Robot
95d2b626db
Merge "Restrict alarm broadcast" into rvc-dev am: a432e5ca8e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14102043
Change-Id: Ia07231a472e1cd799baf562b3d90682fe74212d3
2021-04-27 14:55:23 +00:00
TreeHugger Robot
e7e38728c1
[automerger skipped] Merge "Restrict alarm broadcast" into rvc-dev am: a432e5ca8e -s ours
...
am skip reason: skip tag Change-Id I4f8e56729d90f8f5288d08881129b1c45d5790e7 with SHA-1 1c08e32233 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14102043
Change-Id: I8ead2f089c100cdcbbebac605ba3d188c3f3a639
2021-04-27 14:53:51 +00:00
TreeHugger Robot
a432e5ca8e
Merge "Restrict alarm broadcast" into rvc-dev
2021-04-27 14:35:43 +00:00
Josh Tsuji
6b095216e5
Merge "Adds the continuous unlock animation!" into sc-dev
2021-04-27 14:23:25 +00:00