Commit Graph

749562 Commits

Author SHA1 Message Date
TreeHugger Robot
bc8adee5c5 Merge changes I3de63438,I671517b9 into tm-dev am: bfdb2defa9
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16970008

Change-Id: I66f3201edac5e660349787b955a917aff2997ff9
2022-02-23 20:33:08 +00:00
Kweku Adams
cb8da6dcf2 Merge "Open up getCloudMediaProvider to mainline modules." into tm-dev am: 872eecc6a7
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16980672

Change-Id: I59d95f91c3b33d77acd423b3d5ed01e737c9947a
2022-02-23 20:09:36 +00:00
Michael Wachenschwanz
ebfbf8edab Merge "Smear ModemActivityInfo across multiple stats" 2022-02-23 20:00:00 +00:00
Mady Mellor
b0ce39320b Merge changes from topic "floating_dismiss" into tm-dev am: ba688138fb
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16943594

Change-Id: Ic8d8e30b06baca6973b766c0c60cf8643d3707f2
2022-02-23 19:58:17 +00:00
Mady Mellor
c797e8672f Merge "Adjustments to expanded view size and position" into tm-dev am: 014c25967b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16941876

Change-Id: Ia8f18e6558ef1e9f88c1271c135e582f25ab3853
2022-02-23 19:48:21 +00:00
Neil Fuller
a795a5485f [automerger skipped] Merge "Switch "UTC time" to "Unix epoch time"" am: 1ecf1d2462 am: b78dfa9ee9 am: 02eebf4399 -s ours am: 14a9a37227 -s ours am: 99c8bbc5af -s ours
am skip reason: Merged-In Ic477c021529a94b4a3665426b7daaf6567fa311a with SHA-1 115132dbaa is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1979487

Change-Id: If779f3585474fb4159d8d3f315347e0b3927b02a
2022-02-23 19:45:53 +00:00
Anton Hansson
bf0167a437 Merge "Revert "Disable ChangedThrows"" am: ea2c2589ab am: 1f453c7572 am: b75c50107c am: 1e48ea5c6c am: 199b33147c
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1994710

Change-Id: I90a7766b0ca77484344fce5435e479ad4cd19c77
2022-02-23 19:17:59 +00:00
Treehugger Robot
bf6e555044 [automerger skipped] Merge "AudioService: fix regression on hearing aid profile" am: 350176393c am: 69bce647f5 am: fd64ffbe30 -s ours am: fbbc3b9f8c -s ours am: bbacff8fa7 -s ours
am skip reason: Merged-In Ie3f8757f5fec78df2da028791e9ba2ebb5833675 with SHA-1 f61f174520 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1994851

Change-Id: I8988818dbc409001eddf955ee4423070d5a56c5e
2022-02-23 19:17:12 +00:00
TreeHugger Robot
b7f8eddeb5 Merge "Stop showing RESTRICTED toast for new restriction." into tm-dev am: 837902ab91 am: 12c7bc3e78
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16980306

Change-Id: Ia40d365426d91297bd6c56d153a6e4e3718808f7
2022-02-23 19:16:24 +00:00
Christian Göllner
a34e8f5279 Merge "Motion: tweak split shade expansion on lockscreen with media." into tm-dev am: aea2342dde am: 01b7e89871
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16979105

Change-Id: I3dc86e379a0b798983ac867c97cfdd21cff280d2
2022-02-23 19:15:50 +00:00
Yu-Han Yang
b61078039a Merge "Refactor IGnss JNI" into tm-dev am: 1c5859537d am: 1a7079f30b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16944465

Change-Id: Ida49e778f1de483407fd9e7528c5873246771ed2
2022-02-23 19:15:11 +00:00
Automerger Merge Worker
625223b280 Merge "Merge "Apply new keyguard orientation when it becomes non-rotatable" into tm-dev am: aa6d81514c am: f8fa159c21" 2022-02-23 19:14:55 +00:00
TreeHugger Robot
d176b9a530 Merge "Apply new keyguard orientation when it becomes non-rotatable" into tm-dev am: aa6d81514c am: f8fa159c21
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16988624

Change-Id: Id9ef5e2a6571614b057279d521431a0dbcb2d04b
2022-02-23 19:14:22 +00:00
Neil Fuller
0e131653d8 [automerger skipped] Merge "Switch "UTC time" to "Unix epoch time"" am: 1ecf1d2462 am: b78dfa9ee9 am: 02eebf4399 -s ours am: 14a9a37227 -s ours
am skip reason: Merged-In Ic477c021529a94b4a3665426b7daaf6567fa311a with SHA-1 115132dbaa is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1979487

Change-Id: Id29c77a1e2f859c25f54c5650ec86c708ba06a43
2022-02-23 19:14:13 +00:00
Pavel Grafov
e552272146 [automerger skipped] Merge "Remove mDeviceOwnerName - it's never read" into tm-dev am: 11c572a248 am: 3e246c9ec4 -s ours
am skip reason: Merged-In Ie484c4dcd3691e427365382b447e6d5a86f95cf4 with SHA-1 0707849bf3 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16965648

Change-Id: Ieae93a18fa434d91c9a8824d68126ee8c41d9bb9
2022-02-23 19:13:38 +00:00
Automerger Merge Worker
7173df9915 Merge "Merge "Revert "Disable ChangedThrows"" am: ea2c2589ab am: 1f453c7572 am: b75c50107c am: 1e48ea5c6c" 2022-02-23 19:13:33 +00:00
Sally Qi
b7357361bb [automerger skipped] Merge "Fix the issue in ImageWriter Builder class." into tm-dev am: 404db92194 am: 6b683473a5 -s ours
am skip reason: Merged-In I69639cfcd7b486d7dc464d549c8a110cbb2ae89f with SHA-1 7da4d8868c is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16983537

Change-Id: I6ec262ce3da7bbd8cf713d1858aef3fca85db02a
2022-02-23 19:13:09 +00:00
Anton Hansson
8363cdfc13 Merge "Revert "Disable ChangedThrows"" am: ea2c2589ab am: 1f453c7572 am: b75c50107c am: 1e48ea5c6c
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1994710

Change-Id: I4851897f25d1c1a9a5efc5a58910e914b48e3755
2022-02-23 19:13:08 +00:00
Automerger Merge Worker
4fbb149150 Merge "[automerger skipped] Merge "AudioService: fix regression on hearing aid profile" am: 350176393c am: 69bce647f5 am: fd64ffbe30 -s ours am: fbbc3b9f8c -s ours" 2022-02-23 19:12:50 +00:00
Treehugger Robot
507d9200cf [automerger skipped] Merge "AudioService: fix regression on hearing aid profile" am: 350176393c am: 69bce647f5 am: fd64ffbe30 -s ours am: fbbc3b9f8c -s ours
am skip reason: Merged-In Ie3f8757f5fec78df2da028791e9ba2ebb5833675 with SHA-1 f61f174520 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1994851

Change-Id: I594fa4d8c82a4b0253f0dbcb51f4297527218a6a
2022-02-23 19:12:23 +00:00
Issei Suzuki
1c0cb7fbc5 Merge "Keep showing wallpaper when starting an app immediatly after unlock." into sc-v2-dev am: efcf2e8553 am: ef310224aa am: 60c042aa67 am: d3a245d28a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16978905

Change-Id: I878ea6dc69e0b474aebb364fc0a6cb936152f7a2
2022-02-23 19:12:16 +00:00
Automerger Merge Worker
47cb83b6c4 Merge "[automerge] Keep showing wallpaper when starting an app immediatly after unlock. 2p: f0a9429cc2 am: ef17fbb23d am: 33cf01cde6 am: 858703c48e" 2022-02-23 19:11:58 +00:00
TreeHugger Robot
fa17379568 Merge "Stop showing RESTRICTED toast for new restriction." into tm-dev am: 837902ab91
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16980306

Change-Id: I77d8184eb807dba5e649c7c34b7549b0e5221529
2022-02-23 19:11:34 +00:00
Presubmit Automerger Backend
e1bf03f75b [automerge] Keep showing wallpaper when starting an app immediatly after unlock. 2p: f0a9429cc2 am: ef17fbb23d am: 33cf01cde6 am: 858703c48e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16978905

Change-Id: Ib199fcaa758bd8f80a12d56345b36511a53cea89
2022-02-23 19:11:31 +00:00
Automerger Merge Worker
9e976c5ed6 Merge "Merge "TouchInsetManager Introduction." into tm-dev am: eaa4519557 am: bc137831b5" 2022-02-23 19:11:25 +00:00
Christian Göllner
e6dc06a76f Merge "Motion: tweak split shade expansion on lockscreen with media." into tm-dev am: aea2342dde
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16979105

Change-Id: I66c99fe03880d219922be817c59c8597cfdf6fca
2022-02-23 19:10:52 +00:00
Bryce Lee
acba981f14 Merge "TouchInsetManager Introduction." into tm-dev am: eaa4519557 am: bc137831b5
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16945209

Change-Id: Iff78204a6cde8170d05e2a6d7a2640c7d0aa27df
2022-02-23 19:10:52 +00:00
Automerger Merge Worker
ccda096596 Merge "Merge "Refactor IGnss JNI" into tm-dev am: 1c5859537d" 2022-02-23 19:10:28 +00:00
Yu-Han Yang
19bb9cb559 Merge "Refactor IGnss JNI" into tm-dev am: 1c5859537d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16944465

Change-Id: Idc5a3e71cd20d6941225770e3659cae58b533276
2022-02-23 19:10:03 +00:00
Philip Junker
60379fda44 Merge "Deprecate ACQUIRE_CAUSES_WAKEUP flag." into tm-dev am: eefc676fd2 am: 196db00285
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16965643

Change-Id: I32314a8fa91b884a0f23a17fb9b3983a72056ac0
2022-02-23 19:09:58 +00:00
Automerger Merge Worker
4abf5e1603 Merge "Merge "User Switcher: Dynamically set max col" into tm-dev am: 8045e6c8b7 am: 2b78cd70fa" 2022-02-23 19:09:49 +00:00
TreeHugger Robot
ac69626bb2 Merge "Apply new keyguard orientation when it becomes non-rotatable" into tm-dev am: aa6d81514c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16988624

Change-Id: I5951edb7f069e80f4962915c8c90ef8ea69f333e
2022-02-23 19:09:15 +00:00
Aaron Liu
5996b05c2e Merge "User Switcher: Dynamically set max col" into tm-dev am: 8045e6c8b7 am: 2b78cd70fa
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16979367

Change-Id: I9d71f672ff733db7fbe9cecb44d8e711cbf4b863
2022-02-23 19:09:07 +00:00
Automerger Merge Worker
beea6d5d4c Merge changes from topic "am-d0f44a600d294126b58cd768c43c2f92"
* changes:
  [automerger skipped] Merge "Remove mDeviceOwnerName - it's never read" into tm-dev am: 11c572a248 -s ours
  [automerger skipped] Remove mDeviceOwnerName - it's never read am: 0707849bf3 -s ours
2022-02-23 19:09:02 +00:00
Pavel Grafov
9cd11e2eac [automerger skipped] Merge "Remove mDeviceOwnerName - it's never read" into tm-dev am: 11c572a248 -s ours
am skip reason: Merged-In Ie484c4dcd3691e427365382b447e6d5a86f95cf4 with SHA-1 8a168e8a40 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16965648

Change-Id: I03bd41ac45c3bab52e0348cae8c9e62c30c8bff8
2022-02-23 19:08:48 +00:00
Pavel Grafov
c3e52064a7 [automerger skipped] Remove mDeviceOwnerName - it's never read am: 0707849bf3 -s ours
am skip reason: Merged-In Ie484c4dcd3691e427365382b447e6d5a86f95cf4 with SHA-1 8a168e8a40 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16965648

Change-Id: I9e1e98ce347ab3540d7baa8fedec7015d5985374
2022-02-23 19:08:31 +00:00
Chavi Weingarten
e76a18c11a Merge "Fix SnapshotTaskTests" into tm-dev am: 901dce085c am: 51cb3f47f1
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16982209

Change-Id: Ib2588c6d64f082f727582cc2f7837e02b5d79fb2
2022-02-23 19:08:16 +00:00
Sally Qi
c8727ad5e6 [automerger skipped] Merge "Fix the issue in ImageWriter Builder class." into tm-dev am: 404db92194 -s ours
am skip reason: Merged-In I69639cfcd7b486d7dc464d549c8a110cbb2ae89f with SHA-1 2161f364bc is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16983537

Change-Id: I0a4cad500efa4deace72904af161788a2c0563ab
2022-02-23 19:07:53 +00:00
Sally Qi
f71ba1073b [automerger skipped] Fix the issue in ImageWriter Builder class. am: 7da4d8868c -s ours
am skip reason: Merged-In I69639cfcd7b486d7dc464d549c8a110cbb2ae89f with SHA-1 2161f364bc is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16983537

Change-Id: I2d3638c6a9e4ddc71c7c1cb24d8b7b15de0fb3d6
2022-02-23 19:07:37 +00:00
Issei Suzuki
34152b5f38 Merge "Keep showing wallpaper when starting an app immediatly after unlock." into sc-v2-dev am: efcf2e8553 am: ef310224aa am: 60c042aa67
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16978905

Change-Id: I1989bc06db1720ea9a3118bd8d22ffb5030efa89
2022-02-23 19:06:56 +00:00
Presubmit Automerger Backend
fa94eddf9a [automerge] Keep showing wallpaper when starting an app immediatly after unlock. 2p: f0a9429cc2 am: ef17fbb23d am: 33cf01cde6
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16978905

Change-Id: I252cf244a655f36eb3defeb166849ccfffcaa7e1
2022-02-23 19:06:16 +00:00
Automerger Merge Worker
81388a6b8a Merge "Merge "TouchInsetManager Introduction." into tm-dev am: eaa4519557" 2022-02-23 19:05:36 +00:00
Automerger Merge Worker
e19de6dab3 Merge "Merge changes I26362ce1,I4ec34b99 into tm-dev am: 68453bc360 am: d441931c64" 2022-02-23 19:05:21 +00:00
Bryce Lee
86717f4f48 Merge "TouchInsetManager Introduction." into tm-dev am: eaa4519557
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16945209

Change-Id: I4cdb38d039cb1e2c597f594c428a517a7063e670
2022-02-23 19:05:11 +00:00
Lucas Silva
04c71899c3 Merge changes I26362ce1,I4ec34b99 into tm-dev am: 68453bc360 am: d441931c64
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16939928

Change-Id: I04798419aa7eae07a4d38e082089a2af35a0ebd2
2022-02-23 19:04:49 +00:00
Philip Junker
1c440689e5 Merge "Deprecate ACQUIRE_CAUSES_WAKEUP flag." into tm-dev am: eefc676fd2
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16965643

Change-Id: I6e345d0926de8a0463cb86191f033cea703f8528
2022-02-23 19:04:39 +00:00
Miranda Kephart
e97562766a Merge changes I3afc4e97,I1ab46134
* changes:
  Fix screenshot not showing up on subsequent screenshots
  Separate callbacks for dismiss start and end
2022-02-23 19:04:34 +00:00
Automerger Merge Worker
eeac0ce39e Merge "Merge "User Switcher: Dynamically set max col" into tm-dev am: 8045e6c8b7" 2022-02-23 19:04:28 +00:00
Aaron Liu
4d91f31841 Merge "User Switcher: Dynamically set max col" into tm-dev am: 8045e6c8b7
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16979367

Change-Id: I09ed49116713806e5b07a60eb2fb5f38abcab97f
2022-02-23 19:03:33 +00:00
TreeHugger Robot
ab5eb46dd3 Merge changes from topic "clear_show_forced_tm_dev" into tm-dev am: de23e70472 am: 0b79847df1
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16973065

Change-Id: I05026d51c6c358b52cc39fce999e0872e9a4ede5
2022-02-23 19:03:21 +00:00