Commit Graph

657108 Commits

Author SHA1 Message Date
Winson Chung
dabc3d285e Merge "Clean up previous DA organizer when registering" into sc-dev am: 2c4f6e1ae6
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15333816

Change-Id: I019cf31cf7deecff84e3143f5490b0e4979b54c3
2021-07-21 00:31:05 +00:00
Shuzhen Wang
53a6b7de48 Merge "Camera: Improve logical camera RAW capture docs" into sc-dev am: 3e72b3e16f
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15114380

Change-Id: I58e25641355f2ff1709fc1e3bc4a72cb895d0595
2021-07-21 00:30:19 +00:00
Winson Chung
2c4f6e1ae6 Merge "Clean up previous DA organizer when registering" into sc-dev 2021-07-21 00:21:18 +00:00
Shuzhen Wang
3e72b3e16f Merge "Camera: Improve logical camera RAW capture docs" into sc-dev 2021-07-21 00:09:26 +00:00
TreeHugger Robot
c8230b63b5 Merge "Stop removing all APP_STANDBY_BUCKET_CHANGED messages." into sc-dev am: 5b6a2aff21
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15331033

Change-Id: I4ed023a09b9ec0bffe54195cb91b632fdead95e1
2021-07-20 23:54:18 +00:00
TreeHugger Robot
5b6a2aff21 Merge "Stop removing all APP_STANDBY_BUCKET_CHANGED messages." into sc-dev 2021-07-20 23:34:59 +00:00
Tatiana Webb
f235b1e8dc Merge "Revert "Launch admin policies settings screen if not possible to launch help page"" into sc-dev am: 277047bc1e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15340583

Change-Id: I30f55349c3d560b62a4899d13f32383cdeb66582
2021-07-20 23:21:00 +00:00
Tatiana Webb
277047bc1e Merge "Revert "Launch admin policies settings screen if not possible to launch help page"" into sc-dev 2021-07-20 23:02:23 +00:00
Kevin Chyn
d5470fa8d1 Merge "6/n: Add support for additional coex cases" into sc-dev am: e086c96b2e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15330269

Change-Id: I7fb34052b3efb50127df43c10faa2c5327a98bcd
2021-07-20 22:57:13 +00:00
Kevin Chyn
e086c96b2e Merge "6/n: Add support for additional coex cases" into sc-dev 2021-07-20 22:45:40 +00:00
TreeHugger Robot
fadfa6cc2e Merge "Ensure notification visibility on stopForeground(false)" into sc-dev am: 2591e466c1
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15288334

Change-Id: I7c5808a6137469824209d78d140620a3904453e3
2021-07-20 22:07:07 +00:00
Lucas Dupin
92b381d41f Merge "Revert "Remove zoom from wake-up transition"" into sc-dev am: c19b69571c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15340831

Change-Id: Ic1dbc23f30dab90e3397afc73efdd2eac5dfdbcc
2021-07-20 22:06:16 +00:00
Kevin Chyn
06977e5bdc Merge "5/n: Add support for initial coex cases" into sc-dev am: 30a9a9b5ec
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15329699

Change-Id: Ib74fa2c5cf9933d5768f4452847ce096248d7c31
2021-07-20 22:05:43 +00:00
TreeHugger Robot
2591e466c1 Merge "Ensure notification visibility on stopForeground(false)" into sc-dev 2021-07-20 22:05:26 +00:00
Winson Chung
cfabf151e5 Clean up previous DA organizer when registering
- There is no guarantee that binderDied() will come in for the old
  process before it tries to re-register. Instead, force clean up
  the existing organizer if another organizer is registered for the
  same feature
- Also unlink the death recipient when unregistering/cleaning up the
  organizer

Fixes: 190786551
Test: Kill SysUI and ensure it doesn't throw
Test: atest DisplayAreaTest
Change-Id: I1204818eefd96d2eb1fb6d195e186f36fd47efac
Merged-In: I1204818eefd96d2eb1fb6d195e186f36fd47efac
2021-07-20 22:03:04 +00:00
Lucas Dupin
c19b69571c Merge "Revert "Remove zoom from wake-up transition"" into sc-dev 2021-07-20 21:54:30 +00:00
Kevin Chyn
30a9a9b5ec Merge "5/n: Add support for initial coex cases" into sc-dev 2021-07-20 21:52:36 +00:00
Ben Lin
d87deceb6e Merge "PiP: Allow customization of PiP minimum size." into sc-dev am: c312c6481b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14077517

Change-Id: I1059c3c96a81084f1fb55b2f99590f4b33bfdbd5
2021-07-20 20:55:45 +00:00
Ben Lin
c312c6481b Merge "PiP: Allow customization of PiP minimum size." into sc-dev 2021-07-20 20:35:36 +00:00
Kevin Chyn
9affacd3f8 6/n: Add support for additional coex cases
If UDFPS succeeds while face is scanning, send haptic+callbacks,
and cancel face auth.

Bug: 193089985
Test: atest CoexCoordinatorTest
Change-Id: Ia261ec35308c70f2c2efcadada41c6c155ec8650
2021-07-20 13:06:58 -07:00
Kevin Chyn
7778c2ea38 5/n: Add support for initial coex cases
1) Adds a way to enable/disable this. By default, this is disabled on
   top of tree (so this change should be a no-op. By default, tests
   enable the advanced behavior.
2) Adds a dump to "adb shell dumpsys biometric"

Bug: 193089985
Test: atest CoexCoordinatorTest
Test: atest com.android.server.biometrics
Test: adb shell dumpsys biometric (with and without secure setting)

Change-Id: I9fe553e9d4b78e34a20b9130f854143a355275bc
2021-07-20 13:06:55 -07:00
Bill Yi
42033987f5 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9393881248 -s ours am: 640f3d9c0d -s ours
am skip reason: subject contains skip directive

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

Change-Id: I2b1d589de39e5ae6c03d29f49f79e1b3615da32b
2021-07-20 19:48:22 +00:00
Bill Yi
12447289ff [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4f2d481a89 -s ours am: 2db52a94b9 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I9a55da0edf1be5672a6911dab73b6de50deaedad
2021-07-20 19:48:05 +00:00
Bill Yi
640f3d9c0d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9393881248 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ie0dc66735e172f27087d6b9aa7414ca1e9ba21f3
2021-07-20 19:48:03 +00:00
TreeHugger Robot
ecd62ac657 Merge "Track active AttributionSources, and finish chains on death" into sc-dev am: a4d18e767a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15312052

Change-Id: I32de34c35030b8b4f873985ba27c68a9024c9d45
2021-07-20 19:47:55 +00:00
Bill Yi
2db52a94b9 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4f2d481a89 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ic8b4a9abd310ecca3e1f99f89bb63af6287da5e9
2021-07-20 19:47:46 +00:00
TreeHugger Robot
a4d18e767a Merge "Track active AttributionSources, and finish chains on death" into sc-dev 2021-07-20 19:36:21 +00:00
TreeHugger Robot
87e7b5306d Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod 2021-07-20 19:31:56 +00:00
Lucas Dupin
53037b291f Revert "Remove zoom from wake-up transition"
Removing the zoom was causing problems with the wake-up animation, where
the wallpaper would jump.

Test: manual
Test: atest NotificationShadeDepthControllerTest
Fixes: 192816091
Change-Id: I571e838509356a9eb9895ea2856e023a7b9f1a15
2021-07-20 12:03:05 -07:00
Tatiana Webb
c2d0388962 Revert "Launch admin policies settings screen if not possible to launch help page"
This reverts commit 75077a17a4.

Reason for revert: DroidMonitor-triggered revert due to breakage https://android-build.googleplex.com/builds/quarterdeck?branch=git_sc-dev&target=errorprone&lkgb=7566424&lkbb=7566443&fkbb=7566443, bug b/194207719

Change-Id: I40603378f3e6f125639169176e21680980e2a93e
2021-07-20 18:58:37 +00:00
Antoan Angelov
8322262e0c Merge "Launch admin policies settings screen if not possible to launch help page" into sc-dev am: 144dab97be
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15286676

Change-Id: I2e66f7c4ff73a9d87ab8263c3140d224b01568d7
2021-07-20 18:26:30 +00:00
Antoan Angelov
144dab97be Merge "Launch admin policies settings screen if not possible to launch help page" into sc-dev 2021-07-20 18:14:20 +00:00
Mohammad Samiul Islam
1d508e5822 Merge "Test apexd behaves correctly when not in fs-checkpoint mode" into sc-dev am: b713ec62bb
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15302099

Change-Id: If617645f00a16a22f883e54118c4ac4d11a0a0db
2021-07-20 18:13:45 +00:00
Benedict Wong
7bd15fef87 Merge "Clear binder calling identity before calling callback" into sc-dev am: 520eb40850
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15302831

Change-Id: Ie66ac69edfdcc4d1da6c25ec5b91059d7e454d20
2021-07-20 18:13:24 +00:00
TreeHugger Robot
d36d69ada6 Merge "MidiService: synchronize mDeviceConnections" into sc-dev am: e65c02b278
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15317991

Change-Id: I99caf1e9b349e4e4d7042eeb024a565764828275
2021-07-20 18:12:41 +00:00
Mohammad Samiul Islam
b713ec62bb Merge "Test apexd behaves correctly when not in fs-checkpoint mode" into sc-dev 2021-07-20 18:02:29 +00:00
Benedict Wong
520eb40850 Merge "Clear binder calling identity before calling callback" into sc-dev 2021-07-20 17:50:24 +00:00
TreeHugger Robot
e65c02b278 Merge "MidiService: synchronize mDeviceConnections" into sc-dev 2021-07-20 17:08:40 +00:00
Shuo Qian
702f32505d Merge "Change the doc to reflect the default status of preferential network service" into sc-dev am: c03fb15e29
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15329706

Change-Id: I5b95e5f6b665d7331893dc96ad2bac2ca7790018
2021-07-20 16:59:53 +00:00
Bill Yi
4f2d481a89 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ie6500b32ba88d70a180ee3c8952a4474808032b8
2021-07-20 16:55:42 +00:00
Bill Yi
2a6b5f42f5 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Id0090fa9d759b8cf5e7792e59346b34e943b86bb
2021-07-20 16:22:58 +00:00
Shuo Qian
c03fb15e29 Merge "Change the doc to reflect the default status of preferential network service" into sc-dev 2021-07-20 16:21:53 +00:00
Bill Yi
9393881248 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Iab06de82d58829c75a7bb50a8ab8647a1a16d7ec
2021-07-20 16:20:16 +00:00
TreeHugger Robot
e283586a5b Merge "Use touch usage on camera shortcut vibration" into sc-dev am: 831024c836
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15328598

Change-Id: Ief6cb4c0dc9f753ecf36b03eaa92ad03e39907d2
2021-07-20 16:05:39 +00:00
TreeHugger Robot
831024c836 Merge "Use touch usage on camera shortcut vibration" into sc-dev 2021-07-20 15:51:26 +00:00
Wu Ahan
d1cb83dd08 Merge "Fix potential memory leak of FrameTracker" into sc-dev am: aef0db8f94
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15334110

Change-Id: I6a3daddd70456cb4eb8f38a5be8a8340317e77a7
2021-07-20 15:27:15 +00:00
Wu Ahan
aef0db8f94 Merge "Fix potential memory leak of FrameTracker" into sc-dev 2021-07-20 15:11:56 +00:00
Issei Suzuki
1837f8673a Merge "Stop animation when screen times out and the user turns on the phone." into sc-dev am: a16f9cc218
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15302103

Change-Id: I1ce7cb0f3053810098a581539016444d0df1e19f
2021-07-20 14:56:42 +00:00
Issei Suzuki
a16f9cc218 Merge "Stop animation when screen times out and the user turns on the phone." into sc-dev 2021-07-20 14:40:26 +00:00
arangelov
75077a17a4 Launch admin policies settings screen if not possible to launch help page
Fixes: 191727929
Test: manually performed policy transparency BYOD test
Test: manually performed policy transparency DO test
Test: manually performed policy transparency DO on
managed user test
Test: atest ActionDisabledLearnMoreButtonLauncherTest

Change-Id: Ief0cc2fab98b28f0836b3dee79e91ea365d37274
2021-07-20 11:55:06 +00:00