Commit Graph

650283 Commits

Author SHA1 Message Date
TreeHugger Robot
fd201ca290 Merge "Add OPSTR_RECORD_AUDIO_HOTWORD to TestApi" into sc-dev am: 881dc456c8
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15166612

Change-Id: I998e849a8e4f005c80bc1f50fbf836471be044c7
2021-07-03 10:44:28 +00:00
TreeHugger Robot
881dc456c8 Merge "Add OPSTR_RECORD_AUDIO_HOTWORD to TestApi" into sc-dev 2021-07-03 10:30:16 +00:00
Ahaan Ugale
11aca08c83 Merge "Re-init HotwordDetectionSrvc when audioserver dies" into sc-dev am: 8fd0ab207a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15187469

Change-Id: Iedd4ac42c63e3920ad519504b8d335e10041ccb8
2021-07-03 09:12:51 +00:00
Ahaan Ugale
8fd0ab207a Merge "Re-init HotwordDetectionSrvc when audioserver dies" into sc-dev 2021-07-03 08:50:06 +00:00
Jayant Chowdhary
ace2b664f9 Merge "camera2: Update mandatory streams for ultra high resolution sensors." into sc-dev am: f9158d2217
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15018023

Change-Id: I58fbd15a8c84ae1a24c5766aa5bca15a46c113b0
2021-07-03 05:59:09 +00:00
Jayant Chowdhary
f9158d2217 Merge "camera2: Update mandatory streams for ultra high resolution sensors." into sc-dev 2021-07-03 05:35:54 +00:00
Ilya Matyukhin
9e89f22482 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: I191a64a9dd71f764a15172a3d0d3752456076337
2021-07-03 05:06:38 +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
acbb44cab3 Merge changes I0f37f856,I55dc5c2a into sc-dev am: 5dea7907f3
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15193078

Change-Id: Idfc11959b8bbeed872f551ef1c8be7ce8de035ed
2021-07-03 04:57:57 +00:00
TreeHugger Robot
e44acbc159 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: I80c73f984508716df6471f105aa534c8df3232a2
2021-07-03 04:57:21 +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
Ahaan Ugale
bb8885f631 Re-init HotwordDetectionSrvc when audioserver dies
We do this instead of simply sending over the new binder to avoid race
conditions with audio reading in the service.

Fix: 190011174
Test: manual - kill audio server, also do this twice in quick
 succession; dsp and non-dsp
Test: atest CtsVoiceInteractionTestCases
Change-Id: Iabee9549512cc09d2305de5b0e965b9315134fb0
2021-07-02 21:51:23 -07:00
TreeHugger Robot
aa2c737e51 Merge "Init HotwordDetectionSrvc identity earlier" into sc-dev 2021-07-03 04:41:08 +00:00
TreeHugger Robot
c0ed9af281 [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: I05f9a2a268be2fc70e28a7583b6f267281c710de
2021-07-03 04:07:47 +00:00
TreeHugger Robot
f0710ca8f1 [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: I181348555e5d8b058deb11523da5dfb59cd81653
2021-07-03 04:07:40 +00:00
TreeHugger Robot
851f502c9c [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: I92f2c68b80cce09d52d2d98946b06a8610cf3d97
2021-07-03 04:07:14 +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
cacc7541b0 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: I4ddbeafe604f4d6195efd43463154d73069c9864
2021-07-03 03:42:09 +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
2e9c5a6a6c 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: I8a8e91055c08435f0255c0379e7f37e019bc4ba1
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
1fccbf7085 [automerger skipped] Merge "Add support for app data accounting for in-kernel dataplanes" into sc-dev am: 836927f24b -s ours
am skip reason: Merged-In I768907cd3dd2028c7040cddd81fc71a5ce69bbdb with SHA-1 bbee1d39b1 is already in history

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

Change-Id: I91d095347ced6a4d16af91371ebefdf68577b724
2021-07-03 02:12:25 +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
bbe27fc68c 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: Ied79c86fd459e936779a44a2c81fafc18e761d42
2021-07-03 01:46:03 +00:00
Kohsuke Yatoh
c6e9fd1ef0 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: Id5c855a1406a0738b6aaf81e7af1336bc5f25a5c
2021-07-03 01:44:44 +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
ee0373e491 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: I20670af72e0fe93f4d86c08c72e722ec4595bd67
2021-07-03 00:27:32 +00:00
Lucas Dupin
cf3afda6a3 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: Iefbb4c479ab2976fce75002ccd9c5d9bddd41ec2
2021-07-03 00:27:07 +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
a46304f591 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: I35bf4d3c4824e890a1d446ce46d0e55a96b46e30
2021-07-03 00:07:08 +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
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
166d16b26e 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: Ic87c6d59feeb669562bf45e7ba2bb5a46341c5a6
2021-07-02 23:16:32 +00:00
Peiyong Lin
e7008de8a4 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: I61aaec74fd6f4e8eace8cf74b9c8a052109320b2
2021-07-02 23:15:31 +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
79a5f7ab9d Merge "Return success when the command is executed." into sc-dev 2021-07-02 23:11:02 +00:00
TreeHugger Robot
9e96fda4af [automerger skipped] Merge "Update BluetoothAdapter and BluetoothDevice documentation" into sc-dev am: dc8a8029bf -s ours
am skip reason: Merged-In I3dbcdacff062f6c33c2fdc8d64170bf60b2fbf6f with SHA-1 d748e6ec7a is already in history

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

Change-Id: Ibc0c24e1d5e900b424188a73e17b18cf3aeeb1eb
2021-07-02 23:09:08 +00:00
TreeHugger Robot
dc8a8029bf Merge "Update BluetoothAdapter and BluetoothDevice documentation" into sc-dev 2021-07-02 23:02:30 +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