Commit Graph

757076 Commits

Author SHA1 Message Date
Fabian Kozynski
4ae15e81bc Merge "Don't crash TileService app when systemui crashes" into tm-dev 2022-04-12 13:16:54 +00:00
Jorim Jaggi
331f163d20 Merge "Fix doc issue linking internal class" into tm-dev 2022-04-12 12:50:54 +00:00
Chris Li
721634a9ec Merge "Fix untrusted embedding visibility in multi windowing mode" into tm-dev 2022-04-12 12:37:16 +00:00
TreeHugger Robot
ab0c667365 Merge "Fixed that the camera will not be blocked on the virtual display in special cases" into tm-dev 2022-04-12 12:21:47 +00:00
Jing Ji
885af3d522 Merge "Update the text of background app battery usage notification." into tm-dev 2022-04-12 11:29:28 +00:00
Julia Reynolds
08f603903c Merge "Modify handling of notifs with invalid sounds" into tm-dev 2022-04-12 11:02:03 +00:00
Michał Brzeziński
cd2ba60978 Merge "Moving brightness slider lower in split shade" into tm-dev 2022-04-12 10:15:23 +00:00
TreeHugger Robot
217edfa93b Merge "SIM slot not available error code added to UpdateAvailableNetworksResult" into tm-dev 2022-04-12 09:49:49 +00:00
Cliff Wu
3895dba947 Fixed that the camera will not be blocked on the virtual display in special cases
- Root cause: When an app uses the system default camera app to open
the camera on the phone, and another app uses an Intent
(MediaStore.ACTION_IMAGE_CAPTURE) (the system default camera app) to
open the camera on the virtual display, because they will use the same
thread in the camera service, the camera will only reconfigure the
stream without creating it again. Therefore, the onCameraOpened callback
will not be triggered, causing the issue that the camera on the virtual
display is not blocked.

- Solution: The camera mechanism is that only one camera can run at a
  time. If two apps open the camera at the same time, it will first open
  and close the camera of one of two apps, and then open the camera of
  another app. So we identify above issue according to this rule: track
  the app that opens the camera on the phone (main display). When it is
  detected that this app also appears on the virtual display, it means
  that the app appears on both sides at the same time, which belongs to
  the above issue, and the camera of this app is set to a blocked state.

Bug: 210795569
Test: Manual
Change-Id: Idabee8a38085c8aae1f47f3579cead1adde385ea
2022-04-12 09:24:44 +00:00
Jacqueline Bronger
6cc02e8d74 Merge "Fix gravity after re-enabling expanded PiP" into tm-dev 2022-04-12 08:48:52 +00:00
Galia Peycheva
427189714d Merge "Fix strange pip size in horizontal expanded mode" into tm-dev 2022-04-12 08:29:43 +00:00
Chris Li
c48483db9e Fix untrusted embedding visibility in multi windowing mode
Before, we search overlay within the same root Task, which can be other
task in split. Now, we only search within the same leaf Task.

Bug: 197364677
Test: atest WmTests:TaskFragmentTest
Change-Id: I64dfdf322a15cfd80f169d0ddfc6e9bbf94d2a03
2022-04-12 14:25:41 +08:00
Tiger Huang
06b93cf997 Merge "Fix WindowInsets#getStableInsets" into tm-dev 2022-04-12 06:09:03 +00:00
Riddle Hsu
dc19fc3bd0 Merge "Do not show animation background with wallpaper transition" into tm-dev 2022-04-12 05:45:11 +00:00
Shaowei Shen
eda5ea3e38 Merge "DO NOT MERGE: Downbranch merge conflict [Output Switcher] Refine seekbar control" into tm-dev 2022-04-12 05:42:21 +00:00
TreeHugger Robot
466dcdd650 Merge "Post the starting of the Notification dialog" into tm-dev 2022-04-12 05:27:34 +00:00
TreeHugger Robot
d421a51399 Merge "Add config to disable Bubbles" into tm-dev 2022-04-12 04:57:50 +00:00
Chris Li
a6b968f887 Merge "No embed activity when Task is in PIP" into tm-dev 2022-04-12 03:29:37 +00:00
Shawn Lin
08cc104906 [automerger skipped] Merge "[DO NOT MERGE] Update to use new res status bar height dimen" into sc-v2-dev am: 2f5827830e am: c0d749ed90 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I1135c619f99128432615ee68ce70ab1960aee0fc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-12 02:36:57 +00:00
Shawn Lin
24eb4b556e Merge changes from topic "sbHeight" into sc-v2-dev-plus-aosp am: 7337802a28
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17686875

Change-Id: Ibf65c7b92a7721aa1ab3cd4a68cab05ef9981142
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-12 02:36:09 +00:00
shawnlin
5972c1d457 [automerger skipped] [automerge] [DO NOT MERGE] Update to use new res status bar height dimen 2p: 47fb15fe8c am: 1f5b53c8c4 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I639e5baa4da709a5347ebd035e5c3fece16b6927
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-12 02:35:46 +00:00
Shawn Lin
c0d749ed90 Merge "[DO NOT MERGE] Update to use new res status bar height dimen" into sc-v2-dev am: 2f5827830e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17686875

Change-Id: Ia35e5f69b5f363b61a208b9dc949cb383c68574f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-12 02:35:45 +00:00
Arthur Hung
92f53fc942 Merge "Exclude TYPE_SECURE_SYSTEM_OVERLAY from onehand mode" into tm-dev 2022-04-12 02:34:17 +00:00
TreeHugger Robot
a5e6d1e6b3 Merge "ActivityRecordInputSink: Ensure timely release of SurfaceControl" into tm-dev 2022-04-12 02:17:45 +00:00
Shawn Lin
455e78d8f4 Merge "Fixed status bar glitch for apps that access internal res" into tm-dev 2022-04-12 02:15:58 +00:00
Shawn Lin
7337802a28 Merge changes from topic "sbHeight" into sc-v2-dev-plus-aosp
* changes:
  [automerge] [DO NOT MERGE] Update to use new res status bar height dimen 2p: 47fb15fe8c
  [DO NOT MERGE] Update to use new res status bar height dimen
2022-04-12 02:14:40 +00:00
Shawn Lin
2f5827830e Merge "[DO NOT MERGE] Update to use new res status bar height dimen" into sc-v2-dev 2022-04-12 02:14:40 +00:00
Minche Li
b26d2ae80b Merge "Notifies magnification change for the transitioning target mode" into tm-dev 2022-04-12 01:10:41 +00:00
Shaowei Shen
49ab839806 Merge "[Output switcher] Check current device" into tm-dev 2022-04-12 00:14:37 +00:00
TreeHugger Robot
887c94e629 Merge "Log PsdsServerConfigured in dumpsys" into tm-dev 2022-04-11 22:01:24 +00:00
Josh Tsuji
b39e1f1a67 Merge "Revert "Revert "Fix shouldControlUnlockedScreenOff.""" into tm-dev 2022-04-11 21:53:39 +00:00
Jing Ji
7571d317b7 Update the text of background app battery usage notification.
Bug: 228879793
Test: Manual - Trigger the notification and check text.
Change-Id: I952b4277b957fc3e1e72bc45495d5cfd48779544
2022-04-11 14:35:50 -07:00
Beverly Tai
b121b54fb4 Merge "Ask user to try fingerprint after face auth fail" into tm-dev 2022-04-11 21:34:05 +00:00
TreeHugger Robot
36e2df5b5f Merge changes from topics "presubmit-am-41e144351270485b94f495fc32653e46", "presubmit-am-d52b531f305c4668b1dfe4f906403ae6" into tm-dev
* changes:
  Wait for an abort event when stopping a model
  Revert "Wait for an abort event when stopping a model"
2022-04-11 21:31:52 +00:00
Evan Severson
02ee782a23 Merge "Update task manager ui information on dialog opening" into tm-dev 2022-04-11 20:49:47 +00:00
Evan Severson
f8825ae669 Merge "Fix RTL mode for FGS manager" into tm-dev 2022-04-11 20:48:11 +00:00
Jorim Jaggi
4e87d6ff0a Fix doc issue linking internal class
Fixes: 148043444
Change-Id: If43ebe0ec38cc00379d8db79481ef2c3116ce867
2022-04-11 22:25:56 +02:00
Julia Reynolds
2210ff10e3 Modify handling of notifs with invalid sounds
Previously, if an app posted a notification with an invalid sound
and they targeted P+, we would not post the notification.

However, sounds are often not in the control of apps, and apps
should not be blamed if those sounds get corrupted.

With this cl, rather than dropping the notification if the app
provides an invalid uri, we will replace the sound with the default
notification sound.

Bug: 227770797
Fixes: 201488127
Test: NotificationRecordTest; modify sms sounds to be invalid and ensure
notification is posted with sound

Change-Id: Id438b7ea6912b13cfb79a09fe700474ad17879de
2022-04-11 19:52:37 +00:00
Oli Lan
f1f03b8f38 Merge "Bad lock object." am: c4227ee28f am: 456ec4b94a am: 2438767d5e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2059634

Change-Id: I7f3acb5a73ff25ab6d80f6b10d4586d7b25a3375
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-11 19:27:00 +00:00
TreeHugger Robot
8c3195cb27 Merge "Catch if an invalid constant is sent" into tm-dev 2022-04-11 18:59:13 +00:00
Ytai Ben-Tsvi
f3e7be0058 Wait for an abort event when stopping a model
Because the client callbacks from SoundTriggerMiddleware service are
async, if a client quickly stops and starts a model, then receives a
detection event for that model, it is impossible for it to tell
whether the event corresponding to the previous or current session,
and thus is unable to reason about the resulting state of the model.

To mitigate that, we will always wait for an abort event when a model
is stopped before any other operation is attempted. This way the
model state stays synchronized.

Bug: 191935600
Fixes: 226926627
Test: Manual verification of soundtrigger use-cases. Specifically,
      quick toggling of Assitant and Now Playing via Settings.
Change-Id: Ia1b91e78aa6981a7b3612ae9213af1b37a333d00
2022-04-11 11:55:20 -07:00
Oli Lan
2438767d5e Merge "Bad lock object." am: c4227ee28f am: 456ec4b94a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2059634

Change-Id: Ifb60b4e17af67b3d9dd7a3265388e9e2f6cca524
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-11 18:45:16 +00:00
Ytai Ben-Tsvi
64c62ca506 Revert "Wait for an abort event when stopping a model"
This reverts commit 6e2eb81ac4.

The original commit fixed b/223922855, which resulted from fixing
b/191935600, but created another.
Blocking the stop() call until the event confirming the stop arrives is
a bad idea, since:
- We have to give up the lock when waiting for the event, and thus lose
  the atomicity of some of the operations. b/226926627 is an example of
  this.
- It turns out some of the forward calls happen from the main thread's
  looper, which is also used for callbacks, and we risk deadlocks.

A follow-up commit will address the fix in a better way.

Bug: 191935600
Bug: 226926627
Bug: 223922855
Test: See next commit in the chain.
Change-Id: I2b9987ae93803d3b4f72a1df56c88e284bed43c5
2022-04-11 11:32:44 -07:00
Mady Mellor
71163eeeb3 Merge "Fix bubble position with IME when the bubble has a custom height" into tm-dev 2022-04-11 18:31:58 +00:00
Mady Mellor
41f1fc6474 Merge "Fix an issue where the selected bubble might move offscreen for IME" into tm-dev 2022-04-11 18:31:48 +00:00
Robert Carr
51ae378da3 ActivityRecordInputSink: Ensure timely release of SurfaceControl
Relying on the garbage collector to release SurfaceControl and trigger
destruction of server-side layers has proven to be unreliable in
monkey testing. In this case it may cause the accumulation of
a large number of InputWindowInfo, leading to oneway binder spam.

Bug: 228810413
Test: Existing tests pass
Change-Id: If961767a1209674f202518f8b8be8f930d1a43e3
2022-04-11 11:25:04 -07:00
Fabian Kozynski
0549cf1251 Don't crash TileService app when systemui crashes
Prevent the host app from crashing if systemui crashes while binding to
it. Instead, just return null and let the new systemui process bind
again, as the service will be unbound.

Test: atest FrameworksCoreTests:TileServiceTest
Test: manual, tiles still work
Fixes: 168756844
Change-Id: I70e0e8a223a84874415f7e649106398a5e039097
2022-04-11 14:10:21 -04:00
Vadim Caen
0ba48fea68 Merge "Migrate PopupWindow to use OnBackInvokedDispatcher" into tm-dev 2022-04-11 17:58:08 +00:00
Shan Huang
3f32ba8755 Merge "Update back arrow panel dimensions." into tm-dev 2022-04-11 17:53:28 +00:00
Oli Lan
456ec4b94a Merge "Bad lock object." am: c4227ee28f
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2059634

Change-Id: I7a7233deb6bfe9abb408912e2fc2daf079c05791
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-11 17:21:55 +00:00