Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
757,036 Commits 3 Branches 0 Tags
92f53fc942639a35bc63e09d2c3fc5be2fbbcd97
Commit Graph

757036 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
Peter Kalauskas
5c011d09c9 Merge "Remove user icon avatar from memory when unlocked" into tm-dev 2022-04-11 17:05:14 +00:00
Oli Lan
c4227ee28f Merge "Bad lock object." 2022-04-11 17:01:30 +00:00
Lucas Silva
dec54533e2 Merge "Revert "Add setting for device docked screen timeout."" into tm-dev 2022-04-11 16:53:46 +00:00
Lucas Dupin
e30c53d99e Merge "Dark mode support for user consent dialog when device log access is requested" into tm-dev 2022-04-11 16:52:04 +00:00
Sally Qi
ff986fe4cc Merge "Add HLG transfer function to proper dataspace" into tm-dev 2022-04-11 16:36:59 +00:00
Pinyao Ting
a710d8fe63 Merge "Implement extra persistence layer for widget provider info" into tm-dev 2022-04-11 16:24:06 +00:00
Christine Franks
edd059b302 Catch if an invalid constant is sent 
Bug: 227332691
Test: atest SystemUITests:com.android.systemui.media.taptotransfer.receiver

Change-Id: I4c9fc065c7a4c96bf51a2d14a1eb1c7abe543a9a
(cherry picked from commit ba7983e830)
Merged-In: I4c9fc065c7a4c96bf51a2d14a1eb1c7abe543a9a
 2022-04-11 16:04:36 +00:00
Makoto Onuki
4e97fd8938 Merge "Fix deadlock in ComponentAliasResolver" into tm-dev 2022-04-11 15:42:59 +00:00
Winson Chiu
47c493ab17 Merge "PMS write settings on shutdown regardless of pending type" into tm-dev 2022-04-11 15:39:42 +00:00
TreeHugger Robot
ff2c2c8aa0 Merge "Remove cancelled job from evaluation list." into tm-dev 2022-04-11 15:36:34 +00:00
Beth Thibodeau
f30664e60b Merge "Add logging for media recommendation events" into tm-dev 2022-04-11 15:36:17 +00:00
Eun-Jeong Shin
2211b35992 Merge "Update font/color of user consent dialog for device log access" into tm-dev 2022-04-11 15:33:47 +00:00
Michał Brzeziński
078a1f717c Merge "Increasing space between scrim and notifications bottom in split shade" into tm-dev 2022-04-11 15:23:30 +00:00
Nicolò Mazzucato
4f81748bbf Merge "Fix notifications count change during animation on keyguard" into tm-dev 2022-04-11 15:18:18 +00:00
Bill Yi
0b0959e4b1 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev 2022-04-11 15:15:01 +00:00
Josh Tsuji
0bd4d53a64 Merge "Adds the staggered ring unlock animation!" into tm-dev 2022-04-11 14:32:46 +00:00
Kai Peng
546fbc8bf7 Bad lock object. 
Locking on an interned string can cause unexpected locking collisions, and we should lock the mLock object here.

Change-Id: I8b6557371b0cb79e1bcbc732982cf66b9de663a5
 2022-04-11 12:41:44 +00:00
Treehugger Robot
6a60515cba Merge "Update test owners for SSL*,Uri*,Url*" am: f743f382c9 am: 8bbe4be031 am: c2d26b0f31 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2061207

Change-Id: Ia64bc1858468b55acfb565dcb9b09c5dc304534b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-11 12:40:57 +00:00
Ankita Vyas
722c06c14d Merge "Move LocaleManagerTests to presubmit suite." into tm-dev 2022-04-11 12:22:29 +00:00
Treehugger Robot
c2d26b0f31 Merge "Update test owners for SSL*,Uri*,Url*" am: f743f382c9 am: 8bbe4be031 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2061207

Change-Id: Ib85c28c4b1d8ab293bca0d531501b0f814de62b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-11 12:21:04 +00:00
Treehugger Robot
8bbe4be031 Merge "Update test owners for SSL*,Uri*,Url*" am: f743f382c9 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2061207

Change-Id: I7252a776092addf2de300cbf17bc63afbcde2c4f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-11 12:00:14 +00:00
Treehugger Robot
f743f382c9 Merge "Update test owners for SSL*,Uri*,Url*" 2022-04-11 11:16:08 +00:00
Robert Horvath
753b4d5265 [automerger skipped] Merge "Add Low Power Standby support to NetworkPolicyManagerService" am: 7881ffd09f am: d24f1adef3 am: d6c02d37af -s ours 
am skip reason: Merged-In I6c554df71b12bcf06f1c98ef70c35242bc90a689 with SHA-1 452ab99df9 is already in history

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

Change-Id: Ibc4787aeddfaf744eb316caa2e67e034e90fc5e4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-11 10:05:03 +00:00
Miguel Aranda
bfb23e7107 Merge "Correct AdditionPerfTest to return void." am: 4e7f5518f1 am: c7c95e1859 am: e25e36ace0 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2059947

Change-Id: I25d820c331eaa65ff3beccf29ff43c3d1aad821e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-11 10:04:05 +00:00
Vadim Caen
7d7fa82fe4 Merge "Fix splashscreen listener not being called" into tm-dev 2022-04-11 09:58:15 +00:00
Louis Chang
bfccc9fdcd Merge "Start a visible requested activity if still in initializing state" into tm-dev 2022-04-11 09:30:58 +00:00
Robert Horvath
d6c02d37af Merge "Add Low Power Standby support to NetworkPolicyManagerService" am: 7881ffd09f am: d24f1adef3 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2059571

Change-Id: I51affc8d7bb5105af01539f1f2b3131fd313906d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-11 09:30:55 +00:00
Miguel Aranda
e25e36ace0 Merge "Correct AdditionPerfTest to return void." am: 4e7f5518f1 am: c7c95e1859 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2059947

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