Commit Graph

655892 Commits

Author SHA1 Message Date
Ilya Matyukhin
49f6124496 Merge "Don't reset to lift reveal - StatusBar will take care of that." into sc-dev am: 1fe82cc698
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15191741

Change-Id: If111a85ac604f73105d1c09d9259c8c8ec0ff6ce
2021-07-03 05:06:42 +00:00
Ilya Matyukhin
1fe82cc698 Merge "Don't reset to lift reveal - StatusBar will take care of that." into sc-dev 2021-07-03 05:00:41 +00:00
Ady Abraham
86a05e181e Merge changes I0f37f856,I55dc5c2a into sc-dev am: 5dea7907f3
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15193078

Change-Id: I698267f65aa862795402a6c69bfeeed589d83a84
2021-07-03 04:57:48 +00:00
TreeHugger Robot
bf00a4312b Merge "Init HotwordDetectionSrvc identity earlier" into sc-dev am: aa2c737e51
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15187288

Change-Id: I652a0a8845862bb99579a4ebbabf10207cda7729
2021-07-03 04:57:22 +00:00
Ady Abraham
5dea7907f3 Merge changes I0f37f856,I55dc5c2a into sc-dev
* changes:
  RefreshRatePolicy: a few fixes
  RefreshRatePolicy: getPreferredRefreshRate should consider preferredRefreshRate
2021-07-03 04:54:35 +00:00
TreeHugger Robot
aa2c737e51 Merge "Init HotwordDetectionSrvc identity earlier" into sc-dev 2021-07-03 04:41:08 +00:00
TreeHugger Robot
23bfd262c9 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 5a5e5d168e -s ours am: b4c73cbe4a -s ours
am skip reason: subject contains skip directive

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

Change-Id: I39f808229c9e5d5db78f58fa81221cb4e3430be2
2021-07-03 04:07:42 +00:00
TreeHugger Robot
00a71e1c5e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: d4446cb571 -s ours am: c20c16c923 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I5fe62bd4eb4975044e0b6f1b307153b4627d3227
2021-07-03 04:07:37 +00:00
TreeHugger Robot
71004a1f98 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 1c318f60be -s ours
am skip reason: subject contains skip directive

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

Change-Id: I781cd73fe7cb71c5a53a73b34fb52d7809d79d6a
2021-07-03 04:07:24 +00:00
TreeHugger Robot
b4c73cbe4a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 5a5e5d168e -s ours
am skip reason: subject contains skip directive

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

Change-Id: I46f5c452647f72b28a2906847649325bfe9b2bcb
2021-07-03 04:00:56 +00:00
TreeHugger Robot
c20c16c923 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: d4446cb571 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I333b4c5fdb58f3f219201119000610e7b35e2d91
2021-07-03 03:49:42 +00:00
TreeHugger Robot
1c318f60be Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-07-03 03:48:18 +00:00
Winson Chung
dba16eac01 Merge "Ensure that the pip transaction matrix has only scale & rotation info" into sc-dev am: 7780fa9e7c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15184134

Change-Id: I2a31ae30063f05b701df94a5bf3d35463a090294
2021-07-03 03:42:31 +00:00
TreeHugger Robot
4d522aff0e Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod 2021-07-03 03:42:07 +00:00
TreeHugger Robot
5a5e5d168e Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod 2021-07-03 03:39:36 +00:00
TreeHugger Robot
d4446cb571 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2021-07-03 03:30:50 +00:00
Winson Chung
7780fa9e7c Merge "Ensure that the pip transaction matrix has only scale & rotation info" into sc-dev 2021-07-03 03:25:20 +00:00
Lyn Han
bd1641ea41 Merge "Enable qs open while shade expansion is still running" into sc-dev am: 4ab79fdb68
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15145288

Change-Id: I31b2722bc6bd1047121d57f1bd7b13b94e247e23
2021-07-03 02:59:47 +00:00
Lyn Han
4ab79fdb68 Merge "Enable qs open while shade expansion is still running" into sc-dev 2021-07-03 02:44:32 +00:00
TreeHugger Robot
1bb3ee5a07 Merge "Add support for app data accounting for in-kernel dataplanes" into sc-dev am: 836927f24b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15191630

Change-Id: Ie5d6dc69c87e07a9781785d264437ffd31180b8f
2021-07-03 02:13:03 +00:00
Ahaan Ugale
cb8ebd1151 Init HotwordDetectionSrvc identity earlier
Grants mic access to the process as soon as it comes up, instead of
waiting for the initialization status callback.

Bug: 190011174
Test: manual - dsp and non-dsp; restarting while invoking the hotword
Test: atest CtsVoiceInteractionTestCases
Change-Id: I54e0b42868f663ae1c9edd9bcf4aaee2a13b827a
2021-07-02 19:06:06 -07:00
TreeHugger Robot
836927f24b Merge "Add support for app data accounting for in-kernel dataplanes" into sc-dev 2021-07-03 02:01:54 +00:00
Michael Wachenschwanz
d1efed6932 Merge "Move RPM stats collection out of BatteryStatsImpl.mLock" into sc-dev am: 42f68a76f5
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15189209

Change-Id: Iea7671b0b0e1d7d929556eb1f2435bdd28b730ee
2021-07-03 01:46:09 +00:00
Kohsuke Yatoh
139a52e00d Merge "Remove dependency to real NotoColorEmoji.ttf." into sc-dev am: 0bff2fa4b2
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15114229

Change-Id: I9f84922a993c7d8be24bd7abba5de36b8ce48203
2021-07-03 01:45:39 +00:00
Michael Wachenschwanz
42f68a76f5 Merge "Move RPM stats collection out of BatteryStatsImpl.mLock" into sc-dev 2021-07-03 01:41:41 +00:00
Kohsuke Yatoh
0bff2fa4b2 Merge "Remove dependency to real NotoColorEmoji.ttf." into sc-dev 2021-07-03 01:29:45 +00:00
Ady Abraham
87d09f88d5 RefreshRatePolicy: a few fixes
RefreshRatePolicyTest had some tests that checks for an app override
vote but use the same vote as the deny list or camera that they are
trying to override. This CL fixes all tests and the implementation
to return the expected values.

Test: atest RefreshRatePolicyTest FrameRateSelectionPriorityTests
Bug: 192413241
Change-Id: I0f37f856947ea39de6ea11c77c11771cbca29b49
2021-07-02 17:50:38 -07:00
Dmitri Plotnikov
034b5142ae Merge "Address race condition in procstate time tracking" into sc-dev am: b1f548e3e4
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15177890

Change-Id: Ia5f29b19c64f24469c7574fd7b9d2013df284c4b
2021-07-03 00:27:45 +00:00
Lucas Dupin
2d4a5f6668 Merge "Remove zoom from wake-up transition" into sc-dev am: e7041811c9
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15192416

Change-Id: I1dc71a77b9aab5224b281b1d1d732f900819a942
2021-07-03 00:26:45 +00:00
Dmitri Plotnikov
b1f548e3e4 Merge "Address race condition in procstate time tracking" into sc-dev 2021-07-03 00:14:15 +00:00
Lucas Dupin
e7041811c9 Merge "Remove zoom from wake-up transition" into sc-dev 2021-07-03 00:10:56 +00:00
Nate Myren
e64b7cc64c Merge "Avoid creating Recognition Callback if preflight fails" into sc-dev am: 243bce6262
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15185845

Change-Id: Ief2d3dcce62b05e7ddd4f2121eadbd671be108a9
2021-07-03 00:05:56 +00:00
Nate Myren
243bce6262 Merge "Avoid creating Recognition Callback if preflight fails" into sc-dev 2021-07-02 23:50:37 +00:00
Bill Yi
34538a99b8 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I00c92bad34a6f6dbfe8118af2c6b5045c333eebd
2021-07-02 23:36:44 +00:00
Bill Yi
5f9bb36d6d Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I8fe65c1d20bc9fe81c3be015b3ccb7cdb7d93079
2021-07-02 23:29:46 +00:00
Bill Yi
b442e7853b Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Iad93c5245b62b723e128dba562afea66f391d95e
2021-07-02 23:25:42 +00:00
Ady Abraham
1e5c50bbe3 RefreshRatePolicy: getPreferredRefreshRate should consider preferredRefreshRate
If an app set the WindowManager.LayoutParams#preferredRefreshRate, refresh
rate policy should return it the the preferred refresh rate of the window
if all the other signals (preferredDisplayModeId or deny list) doesn't
have a vote.

Test: atest RefreshRatePolicyTest FrameRateSelectionPriorityTests
Bug: 192413241
Change-Id: I55dc5c2acc8b66cfedbd0c0f0fb66c57eeaa36fe
2021-07-02 16:23:45 -07:00
Bill Yi
1bd9fc82e1 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: If42deaf592f9b28d3fbcd8b7864b016d51019dcb
2021-07-02 23:21:36 +00:00
Ryan Mitchell
c9d0c36a17 Merge "Revert "Extract info on LoadedPackage crash"" into sc-dev am: 66d9c07d2e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15142899

Change-Id: Id4d3009b1e57ca6315c863b94a1943e8da97b287
2021-07-02 23:14:30 +00:00
Ryan Mitchell
66d9c07d2e Merge "Revert "Extract info on LoadedPackage crash"" into sc-dev 2021-07-02 23:11:46 +00:00
Peiyong Lin
6060aeb624 Merge "Return success when the command is executed." into sc-dev am: 79a5f7ab9d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15179875

Change-Id: I4175b319dacd14ce29b2ac1343636d8c62726994
2021-07-02 23:11:20 +00:00
TreeHugger Robot
c3e731e1a6 Merge "Update BluetoothAdapter and BluetoothDevice documentation" into sc-dev am: dc8a8029bf
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15180070

Change-Id: I95a67d0aae8acc4870a49db59565c5c4b74df6b4
2021-07-02 23:11:03 +00:00
Peiyong Lin
79a5f7ab9d Merge "Return success when the command is executed." into sc-dev 2021-07-02 23:11:02 +00:00
TreeHugger Robot
dc8a8029bf Merge "Update BluetoothAdapter and BluetoothDevice documentation" into sc-dev 2021-07-02 23:02:30 +00:00
Jiabin Huang
52e44edac8 Merge "Add context in AudioManager.hasHapticChannels." into sc-dev am: 1d4e2f5bb0
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15180281

Change-Id: I9206ecea7b8cabb0a8b8593500b4a1219d521d6e
2021-07-02 22:59:19 +00:00
Michael Wachenschwanz
62a9ff6718 Move RPM stats collection out of BatteryStatsImpl.mLock
Querying RPM stats on device with a large number of StateResidency info
can take a long time. Move the query to outside of the BatteryStats
lock to reduce the chance of lock contention.

Bug: 185970842
Test: atest android.cts.statsd.validation.ValidationTests#testPartialWakelock

Change-Id: I1c69b3f9c071e5d758cf4b22855c4b0ec221a5cf
2021-07-02 15:58:27 -07:00
Jiabin Huang
1d4e2f5bb0 Merge "Add context in AudioManager.hasHapticChannels." into sc-dev 2021-07-02 22:54:18 +00:00
Silin Huang
efe6de2e41 Merge "Add westworld log to quick access wallet UI." into sc-dev am: bceb8dc9b0
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15190472

Change-Id: I82dd55dfcdc7e4d55c7efe404a8923d5f77fb886
2021-07-02 22:40:21 +00:00
TreeHugger Robot
55f6e9b656 Merge "Fix NPE in TvPipController" into sc-dev am: 03b61d22b6
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15156230

Change-Id: I1cda2a9471bfce8c855e35c6e4be95d435d02a55
2021-07-02 22:39:46 +00:00
Silin Huang
bceb8dc9b0 Merge "Add westworld log to quick access wallet UI." into sc-dev 2021-07-02 22:26:18 +00:00