Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
760,812 Commits 3 Branches 0 Tags
6655eef987498de9eda8068f4a4cb792e2bcb4ac
Commit Graph

760812 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chris Li
6655eef987 Merge changes from topic "presubmit-am-ea582a154fef4cbc9b57e3c967f1016b" into tm-mainline-prod 
* changes:
  [automerge] No embed activity when Task is in PIP 2p: c3b209094c
  No embed activity when Task is in PIP
 2022-04-12 03:29:37 +00:00
Shawn Lin
f61be2358f [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: 08cc104906 -s ours 
am skip reason: subject contains skip directive

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

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

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

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

Change-Id: I65112997307e791d6cf96b70f044ca1cfe322be5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-12 02:39:43 +00:00
Arthur Hung
647340d139 Merge "Exclude TYPE_SECURE_SYSTEM_OVERLAY from onehand mode" into tm-dev am: 92f53fc942 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17635306

Change-Id: I81c49b10b0ceb57eb73a1edd3fd05739e921c301
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-12 02:38:45 +00:00
TreeHugger Robot
290abbd37a Merge "ActivityRecordInputSink: Ensure timely release of SurfaceControl" into tm-dev am: a5e6d1e6b3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17694571

Change-Id: I5ac37a4d012dcd465f06c9d0932c9a0225a98746
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-12 02:37:49 +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
f83b9f4222 Merge "Fixed status bar glitch for apps that access internal res" into tm-dev am: 455e78d8f4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17534146

Change-Id: I0e96f78c6a3e026fdb457f7e0b38691d69df7e1c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-12 02:36:10 +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
Arthur Hung
6b13d60abc Merge changes from topic "presubmit-am-d842c29bd1bd43a78e30c4e5c8765007" into tm-mainline-prod 
* changes:
  [automerge] Exclude TYPE_SECURE_SYSTEM_OVERLAY from onehand mode 2p: 66f44bd54d
  Exclude TYPE_SECURE_SYSTEM_OVERLAY from onehand mode
 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
TreeHugger Robot
6520f17388 Merge changes from topic "presubmit-am-68408850f2c84138b668069c6e3a2e5a" into tm-mainline-prod 
* changes:
  [automerge] ActivityRecordInputSink: Ensure timely release of SurfaceControl 2p: 51ae378da3
  ActivityRecordInputSink: Ensure timely release of SurfaceControl
 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
ca1832916f Merge changes from topic "tm-sbH" into tm-mainline-prod 
* changes:
  [automerge] Fixed status bar glitch for apps that access internal res 2p: 71eaca7ede
  Fixed status bar glitch for apps that access internal res
 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
c4dddbfea8 Merge "Notifies magnification change for the transitioning target mode" into tm-dev am: b26d2ae80b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17040106

Change-Id: If5c6364f1a96f7b14fac0c032500ba3fed1513cc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-12 01:28:06 +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
Minche Li
284c9ee3df Merge changes from topic "209701404" into tm-mainline-prod 
* changes:
  [automerge] Notifies magnification change for the transitioning target mode 2p: d560a73ca9
  Notifies magnification change for the transitioning target mode
 2022-04-12 01:10:41 +00:00
Shaowei Shen
e44051fed4 Merge "[Output switcher] Check current device" into tm-dev am: 49ab839806 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17608150

Change-Id: I9213292de90150d521fc80f463c66f9ecf87c5c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-12 00:59:10 +00:00
Shaowei Shen
49ab839806 Merge "[Output switcher] Check current device" into tm-dev 2022-04-12 00:14:37 +00:00
TreeHugger Robot
46e9b1b928 Merge "Log PsdsServerConfigured in dumpsys" into tm-dev am: 887c94e629 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17666655

Change-Id: I9af8b4b7463df084bc0fc5b37c7a2acb41ec1132
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-11 22:15:37 +00:00
TreeHugger Robot
887c94e629 Merge "Log PsdsServerConfigured in dumpsys" into tm-dev 2022-04-11 22:01:24 +00:00
TreeHugger Robot
bf482b7622 Merge changes from topic "presubmit-am-9fdbad9da9a94b66a07e5160c90c8535" into tm-mainline-prod 
* changes:
  [automerge] Log PsdsServerConfigured in dumpsys 2p: e80c5a134a
  Log PsdsServerConfigured in dumpsys
 2022-04-11 22:01:24 +00:00
Josh Tsuji
444742f790 Merge "Revert "Revert "Fix shouldControlUnlockedScreenOff.""" into tm-dev am: b39e1f1a67 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17571000

Change-Id: I67561e369585c4eb1176091c5589b6c4c6138a12
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-11 21:55:09 +00:00
Beverly Tai
4c7027aa3e Merge "Ask user to try fingerprint after face auth fail" into tm-dev am: b121b54fb4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17607578

Change-Id: If90f81652f353f9b1630bae64eef33786404bd62
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-11 21:54:22 +00:00
TreeHugger Robot
096643f535 Merge changes from topics "presubmit-am-41e144351270485b94f495fc32653e46", "presubmit-am-d52b531f305c4668b1dfe4f906403ae6" into tm-dev am: 36e2df5b5f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17626108

Change-Id: I4af89c739aacba9818edbc98079cd1ff4c9d844f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-11 21:53:55 +00:00
Josh Tsuji
b39e1f1a67 Merge "Revert "Revert "Fix shouldControlUnlockedScreenOff.""" into tm-dev 2022-04-11 21:53:39 +00:00
Josh Tsuji
9548c68d57 Merge changes from topic "tsuji-screenoff_0329" into tm-mainline-prod 
* changes:
  [automerge] Revert "Revert "Fix shouldControlUnlockedScreenOff."" 2p: 38a5f2252d
  Revert "Revert "Fix shouldControlUnlockedScreenOff.""
 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
Beverly Tai
ec071652bc Merge changes from topic "presubmit-am-03c717081b8041d984fabd05965efce5" into tm-mainline-prod 
* changes:
  [automerge] Ask user to try fingerprint after face auth fail 2p: e1aa212d2b
  Ask user to try fingerprint after face auth fail
 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
TreeHugger Robot
b193890c87 Merge changes from topic "presubmit-am-41e144351270485b94f495fc32653e46" into tm-mainline-prod 
* changes:
  [automerge] Revert "Wait for an abort event when stopping a model" 2p: 64c62ca506
  Revert "Wait for an abort event when stopping a model"
 2022-04-11 21:31:52 +00:00
Evan Severson
9329d88bc9 Merge "Update task manager ui information on dialog opening" into tm-dev am: 02ee782a23 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17667592

Change-Id: I666834b41d88c7384340c38c80e28ec31acfe6d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-11 21:09:58 +00:00
Evan Severson
859017d261 Merge "Fix RTL mode for FGS manager" into tm-dev am: f8825ae669 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17667090

Change-Id: I4991f5fff518b0b027351d74d228d81e2d8e43ad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-11 21:09:04 +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
35fa3aeae1 Merge changes from topic "presubmit-am-4cfc5fcc7fcb4e28a3c5befdc77cd3ea" into tm-mainline-prod 
* changes:
  [automerge] Update task manager ui information on dialog opening 2p: 6336ca4738
  Update task manager ui information on dialog opening
 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
Evan Severson
2d4f6ed2f9 Merge changes from topic "presubmit-am-006c5140b9fb42ccbea1fb7797306405" into tm-mainline-prod 
* changes:
  [automerge] Fix RTL mode for FGS manager 2p: f947ac20c1
  Fix RTL mode for FGS manager
 2022-04-11 20:48:11 +00:00
Oli Lan
fb6b9075c9 Merge "Bad lock object." am: c4227ee28f am: 456ec4b94a am: 2438767d5e am: f1f03b8f38 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2059634

Change-Id: I2b9aa6fbb84b0ab3d6876415312f99c34160e88c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-11 19:39:52 +00:00
TreeHugger Robot
3839d51403 [automerger skipped] Merge "Catch if an invalid constant is sent" into tm-dev am: 8c3195cb27 -s ours 
am skip reason: Merged-In I4c9fc065c7a4c96bf51a2d14a1eb1c7abe543a9a with SHA-1 edd059b302 is already in history

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

Change-Id: I975ed6e24dbbc51a9acb7c65135022bb50d55e62
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-11 19:38:55 +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
a09aed3592 Merge changes from topic "presubmit-am-9eb43876b6f544bc8e5ec2647746fcca" into tm-mainline-prod 
* changes:
  [automerge] Catch if an invalid constant is sent 2p: edd059b302
  Catch if an invalid constant is sent
 2022-04-11 18:59:13 +00:00
TreeHugger Robot
8c3195cb27 Merge "Catch if an invalid constant is sent" into tm-dev 2022-04-11 18:59:13 +00:00
Presubmit Automerger Backend
958db37266 [automerge] Revert "Wait for an abort event when stopping a model" 2p: 64c62ca506 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17626107

Bug: 191935600
Bug: 226926627
Bug: 223922855
Change-Id: Ia014e87212914f459a80395033a0fed890dddeec
 2022-04-11 18:57:55 +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
Mady Mellor
38c897b3de Merge "Fix bubble position with IME when the bubble has a custom height" into tm-dev am: 71163eeeb3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17667692

Change-Id: I66e0d32a64a513c862e5d541dd67c02ceb22219c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-11 18:53:07 +00:00