Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
789,922 Commits 3 Branches 0 Tags
24a824156fe4e5f7350da198643fa2cfedcd2eda
Commit Graph

789922 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Joanne Chung
9fa9fc8bc5 Add event log for content capture 
Add event log for content capute connect and set allowlist to help
the debugging.

Some examples:
I cc_connect_state_changed( 1762): [com.google.android.as/com.google
.android.apps.miphone.aiai.app.AiAiContentCaptureService,1]
I cc_set_allowlist: [14,0]

Bug: 233040086
Test: manual. To watch event log
Change-Id: I9e836928896bd34ae41289059e83c74bf7aa3969
 2022-07-20 11:29:13 +00:00
Victor Chang
27f8e8943b Merge "Deprecate Debug.enableEmulatorTraceOutput()" am: 3f007c4dea am: b0bbe9b5f3 am: fd818a3610 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2154934

Change-Id: Ia824996f9da95791df213deac147e2cf5e22c227
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-20 10:57:27 +00:00
Victor Chang
fd818a3610 Merge "Deprecate Debug.enableEmulatorTraceOutput()" am: 3f007c4dea am: b0bbe9b5f3 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2154934

Change-Id: I73022c7c3840483af31390c297ded5d904de51fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-20 10:41:35 +00:00
Victor Chang
b0bbe9b5f3 Merge "Deprecate Debug.enableEmulatorTraceOutput()" am: 3f007c4dea 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2154934

Change-Id: I254df58123db32e542a75176544313776c55d20b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-20 10:23:51 +00:00
Victor Chang
3f007c4dea Merge "Deprecate Debug.enableEmulatorTraceOutput()" 2022-07-20 09:57:40 +00:00
Jordan Demeulenaere
72a21cf33a Merge "Don't schedule SurfaceControl transaction if it is not valid" into tm-qpr-dev am: 34ffe6d58b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19338489

Change-Id: I2c2a258f6a3cbc1ba2e10e6f4f6e48a8ee2e0b5e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-20 09:31:51 +00:00
Automerger Merge Worker
1b46382ac5 Merge "[automerger skipped] Stop crashing the system on hitting the alarm limit am: c010da3a46 am: ee9331c0d3 -s ours am: ff26f6a3b7 -s ours am: c2841d8ef1 -s ours am: 1479d4c594 -s ours am: b3f3961df2 -s ours am: 6a3dcb1f87 -s ours am: e15951e5f2 -s ours am: eb87970424 -s ours" into tm-d1-dev-plus-aosp am: 547b36e431 -s ours 
am skip reason: Merged-In Id5e94d44ac9ab24870a8213ec7583da0f592a5ff with SHA-1 c010da3a46 is already in history

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

Change-Id: Ifbb7746cf6ac5e3a748a6c7a7bf964451bd3dbe0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-20 09:28:50 +00:00
Suprabh Shukla
b09b977d4d [automerger skipped] Stop crashing the system on hitting the alarm limit am: c010da3a46 am: ee9331c0d3 -s ours am: ff26f6a3b7 -s ours am: c2841d8ef1 -s ours am: 1479d4c594 -s ours am: b3f3961df2 -s ours am: 6a3dcb1f87 -s ours am: e15951e5f2 -s ours am: eb87970424 -s ours am: 550e499681 -s ours 
am skip reason: skipped by user suprabh

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

Change-Id: Ia11039c001751b88c338511edbc49d19197f7db1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-20 09:28:46 +00:00
Automerger Merge Worker
f238a71632 Merge "[automerger skipped] Stop crashing the system on hitting the alarm limit am: c010da3a46 am: ee9331c0d3 -s ours am: ff26f6a3b7 -s ours am: c2841d8ef1 -s ours am: 1479d4c594 -s ours am: b3f3961df2 -s ours am: 6a3dcb1f87 -s ours am: e15951e5f2 -s ours am: 904e5190a7 -s ours" into tm-d1-dev-plus-aosp am: b625dde4ef -s ours 
am skip reason: Merged-In Id5e94d44ac9ab24870a8213ec7583da0f592a5ff with SHA-1 c010da3a46 is already in history

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

Change-Id: I50ace0c66cdbd1949c84ab11b00d54e378b90024
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-20 09:27:54 +00:00
Suprabh Shukla
17fe5fdb8e [automerger skipped] Stop crashing the system on hitting the alarm limit am: c010da3a46 am: ee9331c0d3 -s ours am: ff26f6a3b7 -s ours am: c2841d8ef1 -s ours am: 1479d4c594 -s ours am: b3f3961df2 -s ours am: 6a3dcb1f87 -s ours am: e15951e5f2 -s ours am: 904e5190a7 -s ours am: 4410686661 -s ours 
am skip reason: skipped by user suprabh

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

Change-Id: Ic8af7132488a21c64d1b5d799e41575734cbefe8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-20 09:27:49 +00:00
Jordan Demeulenaere
34ffe6d58b Merge "Don't schedule SurfaceControl transaction if it is not valid" into tm-qpr-dev 2022-07-20 09:26:56 +00:00
Automerger Merge Worker
153aa90394 Merge "[automerger skipped] Stop crashing the system on hitting the alarm limit am: c010da3a46 am: ee9331c0d3 -s ours am: ff26f6a3b7 -s ours am: c2841d8ef1 -s ours am: 1479d4c594 -s ours am: 650e883ff7 -s ours am: 1217209edf -s ours am: 8df5c20670 -s ours" into tm-d1-dev-plus-aosp am: 802221ba27 -s ours 
am skip reason: Merged-In Id5e94d44ac9ab24870a8213ec7583da0f592a5ff with SHA-1 c010da3a46 is already in history

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

Change-Id: I44725e25f8e7f2fe05ea396ea2bfd43ad9322d18
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-20 09:26:51 +00:00
Suprabh Shukla
a95df0ba49 [automerger skipped] Stop crashing the system on hitting the alarm limit am: c010da3a46 am: ee9331c0d3 -s ours am: ff26f6a3b7 -s ours am: c2841d8ef1 -s ours am: 1479d4c594 -s ours am: 650e883ff7 -s ours am: 1217209edf -s ours am: 8df5c20670 -s ours am: 610efebf54 -s ours 
am skip reason: skipped by user suprabh

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

Change-Id: Ie6269288a42f11cb25da8f71d90ed7290d5754d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-20 09:26:36 +00:00
Suprabh Shukla
f3ea79c3ca [automerger skipped] Stop crashing the system on hitting the alarm limit am: c010da3a46 am: ee9331c0d3 -s ours am: ff26f6a3b7 -s ours am: c2841d8ef1 -s ours am: 1479d4c594 -s ours am: 650e883ff7 -s ours am: 1217209edf -s ours am: a001487ac6 -s ours am: ffc8943617 -s ours 
am skip reason: skipped by user suprabh

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

Change-Id: Id3d9372d382d5902fa7067a79b7a4552d6f85f96
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-20 09:26:02 +00:00
Suprabh Shukla
72f2fa6795 [automerger skipped] Stop crashing the system on hitting the alarm limit am: c010da3a46 am: ee9331c0d3 -s ours am: ff26f6a3b7 -s ours am: c2841d8ef1 -s ours am: 1479d4c594 -s ours am: b3f3961df2 -s ours am: 6a3dcb1f87 -s ours am: e15951e5f2 -s ours am: 904e5190a7 -s ours am: edc5347ff7 -s ours 
am skip reason: skipped by user suprabh

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

Change-Id: Ib24062afd4cd5661dc3066c7e08b0ce42d4d97da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-20 09:24:24 +00:00
Suprabh Shukla
2cf6a29642 [automerger skipped] Stop crashing the system on hitting the alarm limit am: c010da3a46 am: ee9331c0d3 -s ours am: ff26f6a3b7 -s ours am: c2841d8ef1 -s ours am: 1479d4c594 -s ours am: 650e883ff7 -s ours am: 1217209edf -s ours am: a001487ac6 -s ours am: a3051c1475 -s ours 
am skip reason: skipped by user suprabh

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

Change-Id: I8e6c651796fb70d1907ce86267348998f7c63988
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-20 09:23:55 +00:00
lucaslin
deda023922 Grant the ACTIVATE_PLATFORM_VPN appop if VPN app has CONTROL_VPN 
This makes the VpnManager APIs consistent with VpnService, ensuring that apps relying on CONTROL_VPN and a separate consent dialog (per CDD) can work properly using the VpnManager. Without this patch, there is an inverted incentive to use the VpnService.

As a workaround, apps using this with CONTROL_VPN already can/do work around this by calling VpnService.prepareAndAuthorize().

Bug: 232051081
Test: atest FrameworksNetTests:VpnTest
Change-Id: I0e0566bb8fed2f9330889e031175c33d499fa855
 2022-07-20 09:11:07 +00:00
Automerger Merge Worker
547b36e431 Merge "[automerger skipped] Stop crashing the system on hitting the alarm limit am: c010da3a46 am: ee9331c0d3 -s ours am: ff26f6a3b7 -s ours am: c2841d8ef1 -s ours am: 1479d4c594 -s ours am: b3f3961df2 -s ours am: 6a3dcb1f87 -s ours am: e15951e5f2 -s ours am: eb87970424 -s ours" into tm-d1-dev-plus-aosp 2022-07-20 09:10:09 +00:00
Automerger Merge Worker
b625dde4ef Merge "[automerger skipped] Stop crashing the system on hitting the alarm limit am: c010da3a46 am: ee9331c0d3 -s ours am: ff26f6a3b7 -s ours am: c2841d8ef1 -s ours am: 1479d4c594 -s ours am: b3f3961df2 -s ours am: 6a3dcb1f87 -s ours am: e15951e5f2 -s ours am: 904e5190a7 -s ours" into tm-d1-dev-plus-aosp 2022-07-20 09:09:58 +00:00
Suprabh Shukla
550e499681 [automerger skipped] Stop crashing the system on hitting the alarm limit am: c010da3a46 am: ee9331c0d3 -s ours am: ff26f6a3b7 -s ours am: c2841d8ef1 -s ours am: 1479d4c594 -s ours am: b3f3961df2 -s ours am: 6a3dcb1f87 -s ours am: e15951e5f2 -s ours am: eb87970424 -s ours 
am skip reason: skipped by user suprabh

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

Change-Id: Icb2644aa82489fef4a41fd0b18ece156df7fdf35
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-20 09:09:56 +00:00
Suprabh Shukla
4410686661 [automerger skipped] Stop crashing the system on hitting the alarm limit am: c010da3a46 am: ee9331c0d3 -s ours am: ff26f6a3b7 -s ours am: c2841d8ef1 -s ours am: 1479d4c594 -s ours am: b3f3961df2 -s ours am: 6a3dcb1f87 -s ours am: e15951e5f2 -s ours am: 904e5190a7 -s ours 
am skip reason: skipped by user suprabh

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

Change-Id: I04a0fd26634c5cd920ebd44724abf48d3c606983
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-20 09:09:40 +00:00
Automerger Merge Worker
802221ba27 Merge "[automerger skipped] Stop crashing the system on hitting the alarm limit am: c010da3a46 am: ee9331c0d3 -s ours am: ff26f6a3b7 -s ours am: c2841d8ef1 -s ours am: 1479d4c594 -s ours am: 650e883ff7 -s ours am: 1217209edf -s ours am: 8df5c20670 -s ours" into tm-d1-dev-plus-aosp 2022-07-20 09:09:40 +00:00
Suprabh Shukla
edc5347ff7 [automerger skipped] Stop crashing the system on hitting the alarm limit am: c010da3a46 am: ee9331c0d3 -s ours am: ff26f6a3b7 -s ours am: c2841d8ef1 -s ours am: 1479d4c594 -s ours am: b3f3961df2 -s ours am: 6a3dcb1f87 -s ours am: e15951e5f2 -s ours am: 904e5190a7 -s ours 
am skip reason: skipped by user suprabh

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

Change-Id: Ic866d3c841cd359290097db4f0b7ef87587648b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-20 09:09:37 +00:00
Suprabh Shukla
a3051c1475 [automerger skipped] Stop crashing the system on hitting the alarm limit am: c010da3a46 am: ee9331c0d3 -s ours am: ff26f6a3b7 -s ours am: c2841d8ef1 -s ours am: 1479d4c594 -s ours am: 650e883ff7 -s ours am: 1217209edf -s ours am: a001487ac6 -s ours 
am skip reason: skipped by user suprabh

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

Change-Id: I7da617ccb36428291a66246f5542416d5d3f6ab2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-20 09:09:29 +00:00
Suprabh Shukla
ffc8943617 [automerger skipped] Stop crashing the system on hitting the alarm limit am: c010da3a46 am: ee9331c0d3 -s ours am: ff26f6a3b7 -s ours am: c2841d8ef1 -s ours am: 1479d4c594 -s ours am: 650e883ff7 -s ours am: 1217209edf -s ours am: a001487ac6 -s ours 
am skip reason: skipped by user suprabh

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

Change-Id: I952d5b6087c7d3d503eed4d11046676c4272e99f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-20 09:09:28 +00:00
Suprabh Shukla
610efebf54 [automerger skipped] Stop crashing the system on hitting the alarm limit am: c010da3a46 am: ee9331c0d3 -s ours am: ff26f6a3b7 -s ours am: c2841d8ef1 -s ours am: 1479d4c594 -s ours am: 650e883ff7 -s ours am: 1217209edf -s ours am: 8df5c20670 -s ours 
am skip reason: skipped by user suprabh

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

Change-Id: I0f25bb203347c6d2baed58981a6e5ed9a945f442
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-20 09:09:24 +00:00
Suprabh Shukla
eb87970424 [automerger skipped] Stop crashing the system on hitting the alarm limit am: c010da3a46 am: ee9331c0d3 -s ours am: ff26f6a3b7 -s ours am: c2841d8ef1 -s ours am: 1479d4c594 -s ours am: b3f3961df2 -s ours am: 6a3dcb1f87 -s ours am: e15951e5f2 -s ours 
am skip reason: skipped by user suprabh

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

Change-Id: I88c60eab74056ce480574f5e902483b8bcad1ce4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-20 08:49:42 +00:00
Jordan Demeulenaere
55a4027966 Merge changes from topics "people-space-screenshot", "screenshot-hardware" into tm-qpr-dev am: 9fcf0aac75 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19268008

Change-Id: I6471899f2022e003aafde4d4965cd964ad9033d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-20 08:43:35 +00:00
Jordan Demeulenaere
70fcf445dd Render View into Bitmap using hardware acceleration (1/2) am: 170bf9e812 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19289531

Change-Id: I9e657c37517178189321fc705e5835a8b62f0830
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-20 08:43:26 +00:00
Suprabh Shukla
904e5190a7 [automerger skipped] Stop crashing the system on hitting the alarm limit am: c010da3a46 am: ee9331c0d3 -s ours am: ff26f6a3b7 -s ours am: c2841d8ef1 -s ours am: 1479d4c594 -s ours am: b3f3961df2 -s ours am: 6a3dcb1f87 -s ours am: e15951e5f2 -s ours 
am skip reason: skipped by user suprabh

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

Change-Id: I478768b120d8d6b7f3e9a4f94027f5be128c85af
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-20 08:42:35 +00:00
Suprabh Shukla
a001487ac6 [automerger skipped] Stop crashing the system on hitting the alarm limit am: c010da3a46 am: ee9331c0d3 -s ours am: ff26f6a3b7 -s ours am: c2841d8ef1 -s ours am: 1479d4c594 -s ours am: 650e883ff7 -s ours am: 1217209edf -s ours 
am skip reason: skipped by user suprabh

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

Change-Id: Ic800336e69ba88630f0b156f24bc03837cdc73dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-20 08:42:30 +00:00
Suprabh Shukla
e15951e5f2 [automerger skipped] Stop crashing the system on hitting the alarm limit am: c010da3a46 am: ee9331c0d3 -s ours am: ff26f6a3b7 -s ours am: c2841d8ef1 -s ours am: 1479d4c594 -s ours am: b3f3961df2 -s ours am: 6a3dcb1f87 -s ours 
am skip reason: skipped by user suprabh

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

Change-Id: I5494e1bc1e6225d8b9cddb5cf69c12b9f574765c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-20 08:41:03 +00:00
Suprabh Shukla
8df5c20670 [automerger skipped] Stop crashing the system on hitting the alarm limit am: c010da3a46 am: ee9331c0d3 -s ours am: ff26f6a3b7 -s ours am: c2841d8ef1 -s ours am: 1479d4c594 -s ours am: 650e883ff7 -s ours am: 1217209edf -s ours 
am skip reason: skipped by user suprabh

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

Change-Id: I779ceb3b8cc0b5dad1d8f353a661e5b97a6321c0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-20 08:40:52 +00:00
Louis Chang
86b9c1b83a Merge "Prevent waiting if no new activity instance launched" into tm-qpr-dev am: f2a5491fda 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19098653

Change-Id: I392f246a4ad0a3e42fc13936239da2241b9e14ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-20 08:40:51 +00:00
Suprabh Shukla
1217209edf [automerger skipped] Stop crashing the system on hitting the alarm limit am: c010da3a46 am: ee9331c0d3 -s ours am: ff26f6a3b7 -s ours am: c2841d8ef1 -s ours am: 1479d4c594 -s ours am: 650e883ff7 -s ours 
am skip reason: skipped by user suprabh

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

Change-Id: I8f6a92dec20c6b43fab14e7ca11403b30f6e1c82
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-20 08:19:05 +00:00
Suprabh Shukla
6a3dcb1f87 [automerger skipped] Stop crashing the system on hitting the alarm limit am: c010da3a46 am: ee9331c0d3 -s ours am: ff26f6a3b7 -s ours am: c2841d8ef1 -s ours am: 1479d4c594 -s ours am: b3f3961df2 -s ours 
am skip reason: skipped by user suprabh

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

Change-Id: Iba2292a2af14bc8b9588462d91e35571b971fd13
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-20 08:18:47 +00:00
Jordan Demeulenaere
9fcf0aac75 Merge changes from topics "people-space-screenshot", "screenshot-hardware" into tm-qpr-dev 
* changes:
  Make the PeopleSpaceActivity screenshot testable
  Render View into Bitmap using hardware acceleration (1/2)
 2022-07-20 08:15:01 +00:00
Christian Göllner
1f12cd43d8 Status Bar - Wrap visible content in containers 
* Implement `onMeasure` in NotificationIconContainer so that we can use
  `wrap_content` on it.
* Wrap the status bar left and right contents in containers with
  `wrap_content`

By wrapping the visible content in containers, we can easily extract the
visible bounds without having to programmatically calculate bounds.

Change-Id: Iebb6c0ddbb767262b0858466db99ea44938f82d3
Merged-In: I07f7a8f4e362b8f4cb32fc196ee1c011498435f7
Fixes: 238410585
Test: Manually
 2022-07-20 08:14:28 +00:00
Louis Chang
f2a5491fda Merge "Prevent waiting if no new activity instance launched" into tm-qpr-dev 2022-07-20 08:14:27 +00:00
Suprabh Shukla
b3f3961df2 [automerger skipped] Stop crashing the system on hitting the alarm limit am: c010da3a46 am: ee9331c0d3 -s ours am: ff26f6a3b7 -s ours am: c2841d8ef1 -s ours am: 1479d4c594 -s ours 
am skip reason: skipped by user suprabh

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

Change-Id: I69154f34c47b8454f474a8fbbd2764e3db135d01
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-20 08:02:09 +00:00
Suprabh Shukla
650e883ff7 [automerger skipped] Stop crashing the system on hitting the alarm limit am: c010da3a46 am: ee9331c0d3 -s ours am: ff26f6a3b7 -s ours am: c2841d8ef1 -s ours am: 1479d4c594 -s ours 
am skip reason: skipped by user suprabh

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

Change-Id: I8ff40caac4ba3cdd7b4f566153992892d64439c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-20 08:01:00 +00:00
Suprabh Shukla
1479d4c594 [automerger skipped] Stop crashing the system on hitting the alarm limit am: c010da3a46 am: ee9331c0d3 -s ours am: ff26f6a3b7 -s ours am: c2841d8ef1 -s ours 
am skip reason: skipped by user suprabh

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

Change-Id: Ib5e63c6277a7538ba41c9ff2c3517fe016e43deb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-20 07:45:27 +00:00
Suprabh Shukla
c2841d8ef1 [automerger skipped] Stop crashing the system on hitting the alarm limit am: c010da3a46 am: ee9331c0d3 -s ours am: ff26f6a3b7 -s ours 
am skip reason: skipped by user suprabh

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

Change-Id: Ia6b5324d8af914029711c1fb63af6b45d5f2b217
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-20 07:19:42 +00:00
Bill Lin
af031b69a2 Only count EVENT_ONE_HANDED_TRIGGER_ROTATION_OUT in STATE_ACTIVE 
The design philosophy of EVENT_ONE_HANDED_TRIGGER_ROTATION_OUT is
- When device in STATE_ACTIVE
- Rotate will automatically exit OHM

We only count when CUJ:
User trigger OHM -> Rotate -> Exit OHM

But bypass the CUJ:
No trigger OHM -> Rotate -> no action

Test: atest SystemUITests
Bug: 239654147
Change-Id: I2e73f29f4edd77998e015db960430f2b3a768349
 2022-07-20 15:17:39 +08:00
Sorin Basca
40b8530a85 [automerger skipped] Merge "Use Mockito 4.6.1 API" am: 59b496c31d -s ours am: 0e6426add4 -s ours am: f520737eef -s ours am: 621686a614 -s ours 
am skip reason: Merged-In I0e301b641312f8cc4a235df5ec62acf1446cbb64 with SHA-1 aceee6876a is already in history

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

Change-Id: I5169d4d27648f3b56de82414385184e84d07cb56
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-20 07:11:20 +00:00
Sorin Basca
b6878789da [automerger skipped] Use Mockito 4.6.1 API am: d12c911fb8 -s ours am: ce66acabec -s ours am: 1c3e5c3fe7 -s ours am: 9590fb2d41 -s ours 
am skip reason: Merged-In I0e301b641312f8cc4a235df5ec62acf1446cbb64 with SHA-1 aceee6876a is already in history

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

Change-Id: I0c6aa92ea7dcea17866bec77a4d01f6ec8fa343c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-20 07:11:07 +00:00
Suprabh Shukla
ff26f6a3b7 [automerger skipped] Stop crashing the system on hitting the alarm limit am: c010da3a46 am: ee9331c0d3 -s ours 
am skip reason: skipped by user suprabh

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

Change-Id: I06963a3201ef81c1fe537bab7a1d51f1e305a924
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-20 07:02:11 +00:00
Sorin Basca
621686a614 [automerger skipped] Merge "Use Mockito 4.6.1 API" am: 59b496c31d -s ours am: 0e6426add4 -s ours am: f520737eef -s ours 
am skip reason: Merged-In I0e301b641312f8cc4a235df5ec62acf1446cbb64 with SHA-1 aceee6876a is already in history

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

Change-Id: I8dd04425874aed490e7e60e0f3ad17e0e8917dd3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-20 06:47:27 +00:00
Sorin Basca
9590fb2d41 [automerger skipped] Use Mockito 4.6.1 API am: d12c911fb8 -s ours am: ce66acabec -s ours am: 1c3e5c3fe7 -s ours 
am skip reason: Merged-In I0e301b641312f8cc4a235df5ec62acf1446cbb64 with SHA-1 aceee6876a is already in history

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

Change-Id: Ic24090695f89fc93549609e6d16a3534cfb23a96
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-20 06:47:08 +00:00
Winson Chung
89041b54e4 Remove unused interfaces and controllers 
- Some interfaces only existed to propagate configuration or keyguard
  changes which now go through the ShellController.  TaskSurfaceHelper
  is no longer used since game dashboard has moved to GMS.

Bug: 238217847
Test: atest WMShellUnitTests
Change-Id: Ie8c5a77bf7bd5b8cc5f4a1b2382013228b1e5e3d
 2022-07-20 06:39:52 +00:00