Bill Yi
e65f480599
[automerger skipped] Merge TQ2A.230505.002 to aosp-master - DO NOT MERGE am: c25270ff98
-s ours am: ec5f7e0cbe
-s ours am: 32b2155c7c
-s ours am: 3aba3d9278
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/device/google/pantah/+/2576875
Change-Id: Ia855c4f3fc68a0012062ff298d344e875483b795
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-05 22:52:07 +00:00
Bill Yi
3aba3d9278
[automerger skipped] Merge TQ2A.230505.002 to aosp-master - DO NOT MERGE am: c25270ff98
-s ours am: ec5f7e0cbe
-s ours am: 32b2155c7c
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/device/google/pantah/+/2576875
Change-Id: Ibb5df104f6dc4517b8357eca27e4f74a24e50d9b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-05 00:43:36 +00:00
Bill Yi
32b2155c7c
[automerger skipped] Merge TQ2A.230505.002 to aosp-master - DO NOT MERGE am: c25270ff98
-s ours am: ec5f7e0cbe
-s ours
...
am skip reason: Merged-In I5d7137dd8d376a306cecfa99246c9edb215672de with SHA-1 4a7a0ba03b
is already in history
Original change: https://android-review.googlesource.com/c/device/google/pantah/+/2576875
Change-Id: I4d1d3351610f15d57cbbfb682f71e989d46e7178
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-05 00:00:54 +00:00
Bill Yi
ec5f7e0cbe
[automerger skipped] Merge TQ2A.230505.002 to aosp-master - DO NOT MERGE am: c25270ff98
-s ours
...
am skip reason: Merged-In I5d7137dd8d376a306cecfa99246c9edb215672de with SHA-1 4a7a0ba03b
is already in history
Original change: https://android-review.googlesource.com/c/device/google/pantah/+/2576875
Change-Id: I687274860fdffbd0f298801fe0737ae55db9963e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 23:21:04 +00:00
Nathan Kulczak
52d760eb52
[DO NOT MERGE] vibrator: Disable PWLE capability for U am: 0302209e61
am: 81a0734190
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/pantah/+/22911813
Change-Id: Ia2cd260488bdb5941cc34a72ccae17d19e3b258f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 21:47:14 +00:00
Nathan Kulczak
0375a99b86
[DO NOT MERGE] vibrator: Disable PWLE capability for U am: 0302209e61
am: cc25c20403
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/pantah/+/22911813
Change-Id: Ieccbc0bdbbc70207d8d7dd66ba42aa8cd5c1d046
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 21:44:59 +00:00
Nathan Kulczak
cc25c20403
[DO NOT MERGE] vibrator: Disable PWLE capability for U am: 0302209e61
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/pantah/+/22911813
Change-Id: I76026c1eaf7fcdefabf02804ba1e738f739b9854
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 21:07:02 +00:00
Nathan Kulczak
81a0734190
[DO NOT MERGE] vibrator: Disable PWLE capability for U am: 0302209e61
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/pantah/+/22911813
Change-Id: I5f334f5983e96816fcdf093f40d195f101c70512
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 21:02:36 +00:00
Nathan Kulczak
0302209e61
[DO NOT MERGE] vibrator: Disable PWLE capability for U
...
Set chirp.enabled=0 so that CAP_FREQUENCY_CONTROL and
CAP_COMPOSE_PWLE_EFFECTS will not be enabled.
Bug: 275032416
Test: adb shell idlcli vibrator getCapabilities
Change-Id: I7371f896126fdc876c43d60718baffba59aa32a1
Signed-off-by: Nathan Kulczak <nathankulczak@google.com>
2023-05-04 20:26:44 +00:00
sashwinbalaji
0d9bc85178
thermal: Update config for stats am: 16c067a53e
am: 088172f34a
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/pantah/+/21806783
Change-Id: I013bddc5bf169ddaf0cd2234025ab43e5a07c407
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 10:52:14 +00:00
sashwinbalaji
6b0c92535f
thermal: Update config for stats am: 16c067a53e
am: 55532f27d2
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/pantah/+/21806783
Change-Id: I6fcb5c62581de38c1b6cbe428028aa21c91dc24d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 10:49:47 +00:00
sashwinbalaji
088172f34a
thermal: Update config for stats am: 16c067a53e
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/pantah/+/21806783
Change-Id: I8e1bf5192b655bbf8a69fb80bdbf1f8051fca508
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 10:08:44 +00:00
sashwinbalaji
55532f27d2
thermal: Update config for stats am: 16c067a53e
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/pantah/+/21806783
Change-Id: I8d5be8fca318be74547b904b4efba345ea132fa9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 10:08:30 +00:00
sashwinbalaji
16c067a53e
thermal: Update config for stats
...
Bug: 259903201
Test: local build and verify stats
Change-Id: Ia1b0c4d31427f1100cec23548e7a8a390179e7b1
2023-05-04 09:28:48 +00:00
Shuibing Dai
108cc22d08
Remove overlay item: country code update during setup wizard am: 85d508c7b6
am: 43073ce71c
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/pantah/+/22975684
Change-Id: I70b3f816f759db8ded0cae6b2f59e5ffe7adb742
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 03:08:27 +00:00
Shuibing Dai
f9d7783879
Remove overlay item: country code update during setup wizard am: 85d508c7b6
am: fa9fad28f2
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/pantah/+/22975684
Change-Id: I0a9fb5eef5cd6ab3b6ea3ac5e608d76a6d5369d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 02:49:36 +00:00
Shuibing Dai
43073ce71c
Remove overlay item: country code update during setup wizard am: 85d508c7b6
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/pantah/+/22975684
Change-Id: I931fcef999f849865bfc0cf0f144c7092584262a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 02:27:07 +00:00
Shuibing Dai
fa9fad28f2
Remove overlay item: country code update during setup wizard am: 85d508c7b6
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/pantah/+/22975684
Change-Id: Icce0252f13c5ba2c15702b8d24739514c85c92de
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 02:22:42 +00:00
Shuibing Dai
85d508c7b6
Remove overlay item: country code update during setup wizard
...
The country code updating from scan results generic case can cover setup wizard case.
Bug: 279625751
Test: manually verified generic case
Change-Id: I364b6f64c4d0bd5a575ca1d8e11872b22ea5ed5e
2023-05-04 01:55:08 +00:00
Suprabh Shukla
2dd8249c7a
Add wakeup interrupt mapping am: d786ac91ca
am: 18d7e93f8e
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/pantah/+/22977072
Change-Id: Ib5640d8c4f19d2be8acffe9ccfc6bab4dcbd9cb7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 01:38:18 +00:00
Suprabh Shukla
11c5154f0b
Add wakeup interrupt mapping am: d786ac91ca
am: be0850caa3
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/pantah/+/22977072
Change-Id: I473dd60a37419d4ded5f0e0a8e406590878060bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 01:35:43 +00:00
Suprabh Shukla
18d7e93f8e
Add wakeup interrupt mapping am: d786ac91ca
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/pantah/+/22977072
Change-Id: I4cdd35cf50cdb9f7eb50ddc79ee9d3771d055bc6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 00:51:14 +00:00
Suprabh Shukla
be0850caa3
Add wakeup interrupt mapping am: d786ac91ca
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/pantah/+/22977072
Change-Id: Ibb14881049d8a60b78da6326e7fe7d720665f4ad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 00:50:16 +00:00
Suprabh Shukla
d786ac91ca
Add wakeup interrupt mapping
...
Test: Manually inspect the output of:
`dumpsys batterystats --wakeups`
Bug: 271922941
Change-Id: I185b0be3b12a70bee7d40d4bfafc36b344989260
2023-05-03 23:56:14 +00:00
Bill Yi
c25270ff98
Merge TQ2A.230505.002 to aosp-master - DO NOT MERGE
...
Merged-In: I5d7137dd8d376a306cecfa99246c9edb215672de
Merged-In: Ie1b2f297bd8aaef4e884b8d2e9f62cd4a5c5b351
Merged-In: I9ab7ba3dac17fa687dbffd68f048af53d861642f
Change-Id: Ica26ab536b1df301bfb2caf4b588ba6854599696
2023-05-03 22:48:43 +00:00
Elliott Hughes
6329d206fc
Add aosp_cheetah_hwasan. am: dd40a981da
am: 146d223370
am: 6f995788b9
am: 8f3a0deca9
...
Original change: https://android-review.googlesource.com/c/device/google/pantah/+/2576771
Change-Id: I27770c36b1d583815daf96f46e2a10b2cfe4e92b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-03 19:38:05 +00:00
Elliott Hughes
8f3a0deca9
Add aosp_cheetah_hwasan. am: dd40a981da
am: 146d223370
am: 6f995788b9
...
Original change: https://android-review.googlesource.com/c/device/google/pantah/+/2576771
Change-Id: I019fea719f63c1b8680c1be5d095e3fb39cf4755
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-03 18:23:09 +00:00
Priyanka Advani
ca148033a5
Revert "Disable Settings large-screen optimization" am: 61e1cb8b17
am: 48eab3ddcb
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/pantah/+/22993393
Change-Id: I47cd87b33942899d663029ac45e3b2d92d15fe70
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-03 17:37:10 +00:00
Elliott Hughes
6f995788b9
Add aosp_cheetah_hwasan. am: dd40a981da
am: 146d223370
...
Original change: https://android-review.googlesource.com/c/device/google/pantah/+/2576771
Change-Id: If0f81334c4192772f299d9401ee2ffcf970c6013
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-03 17:36:15 +00:00
Priyanka Advani
a13164f3df
Revert "Disable Settings large-screen optimization" am: 61e1cb8b17
am: b65e26cda9
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/pantah/+/22993393
Change-Id: Iacf6a260b87c14c21dc01359bf42e3aad949ee7f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-03 17:21:04 +00:00
Priyanka Advani
48eab3ddcb
Revert "Disable Settings large-screen optimization" am: 61e1cb8b17
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/pantah/+/22993393
Change-Id: I1820a33d8ee39877936ad0c27873bf8f21b30939
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-03 16:37:22 +00:00
Priyanka Advani
b65e26cda9
Revert "Disable Settings large-screen optimization" am: 61e1cb8b17
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/pantah/+/22993393
Change-Id: I3700fe473623a934385656ea546fb34cbf9f8e3c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-03 16:37:22 +00:00
Elliott Hughes
146d223370
Add aosp_cheetah_hwasan. am: dd40a981da
...
Original change: https://android-review.googlesource.com/c/device/google/pantah/+/2576771
Change-Id: If2ad2d56afdae854129b5bd757620ea06ece8d27
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-03 16:13:54 +00:00
Priyanka Advani
61e1cb8b17
Revert "Disable Settings large-screen optimization"
...
Revert submission 22926596-disable_large_screen_opt
Reason for revert: b/280606740
Reverted changes: /q/submissionid:22926596-disable_large_screen_opt
Change-Id: Iceb14a1ae1006193f9522a7a88e494918c367bb3
2023-05-03 16:05:32 +00:00
Charles Chen
93220883d0
Disable Settings large-screen optimization am: adf93a5781
am: a20b95faa8
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/pantah/+/22874714
Change-Id: I98f67df5a6aeadac03031817f89dd3f633bfcf4d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-03 06:30:44 +00:00
Charles Chen
8a6745c52f
Disable Settings large-screen optimization am: adf93a5781
am: 9ae24d8cb2
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/pantah/+/22874714
Change-Id: I04d3c0365c8634db34c05367a5ccc083a60e5b08
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-03 06:27:08 +00:00
Charles Chen
a20b95faa8
Disable Settings large-screen optimization am: adf93a5781
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/pantah/+/22874714
Change-Id: I4e8b5086e7c11abed0c8799a5bc840e100ba0fbf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-03 05:49:00 +00:00
Charles Chen
9ae24d8cb2
Disable Settings large-screen optimization am: adf93a5781
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/pantah/+/22874714
Change-Id: Ia41def4db3ab4a741d357a754d6429a07a6d1522
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-03 05:48:15 +00:00
Charles Chen
adf93a5781
Disable Settings large-screen optimization
...
Disable the optimization that is automatically enabled when
including Window Extensions through Activity Embedding.
The optimization causes to launch an additional trampoline
activity for deep links, even when the screen size is smaller
than required by Activity Embedding rules.
Bug: 267725145
Bug: 279461170
Test: Build, perf metrics
Test: atest LauncherIronwoodIntegrationTests:android.platform.test.scenario.launcher.integration_tests.HomescreenCustomizationTests
Change-Id: I0a032022b80d6171e77ce87c7b09d9aa7c9b3187
2023-05-03 05:44:06 +00:00
Elliott Hughes
dd40a981da
Add aosp_cheetah_hwasan.
...
Test: lunch aosp_cheetah_hwasan-userdebug
Change-Id: I12bb5c139fa39fed6322d32d11b0d10f617be5f6
2023-05-02 16:59:10 -07:00
Rios Kao
de6f53bbd6
audio: add smartfeature table for chre tuning am: f556de9f1f
am: 655217b8b5
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/pantah/+/22835120
Change-Id: I59be6704174ef5035460f2dc31b650cb50e775fc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-28 04:06:04 +00:00
Rios Kao
f236bbe601
audio: add smartfeature table for chre tuning am: f556de9f1f
am: d5b55bee42
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/pantah/+/22835120
Change-Id: Ic15f50a5dbee9b5b220970ca1a2c68382170e2da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-28 03:46:55 +00:00
Rios Kao
655217b8b5
audio: add smartfeature table for chre tuning am: f556de9f1f
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/pantah/+/22835120
Change-Id: I35c6a9228f7052033566dbe8bc7547ff8a9f8b20
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-28 03:22:30 +00:00
Rios Kao
d5b55bee42
audio: add smartfeature table for chre tuning am: f556de9f1f
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/pantah/+/22835120
Change-Id: I9ab7ba3dac17fa687dbffd68f048af53d861642f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-28 03:05:33 +00:00
Rios Kao
f556de9f1f
audio: add smartfeature table for chre tuning
...
note: add smartfeature.gstf that only used for Hotword
pipeline in AoC which is sharing to chre usage too.
On WHI_PRO
CHRE PDM Gain(gain=158)
CHRE AEC Gain(gain=-42)
CHRE SRC AEC Timeout(timeout=0)
This table also contains hotword gain control as
Non Eraser gain (gain=220)
Eraser Post Gain (gain=220)
Test: end-to-end verify by CHRE
using aoc_audio_cfg to query gain as below
adb shell aoc_audio_cfg hotword_get_non_eraser_gain
adb shell aoc_audio_cfg hotword_get_eraser_post_gain
Bug: 271078701
Change-Id: I14ee4856887d6a6587b34733288a76c305c271dc
2023-04-28 02:17:26 +00:00
Qais Yousef
c1bdbf9351
Fix wrong uclamp setting am: 5ec2a126fe
am: a2963aef6c
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/pantah/+/22876742
Change-Id: I44403e4c1f3ff1cc9628712b707b8fb73267fcf4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-26 12:15:10 +00:00
Qais Yousef
d2f70f57f4
Fix wrong uclamp setting am: 5ec2a126fe
am: 73480d0c1a
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/pantah/+/22876742
Change-Id: I89be70029c25ee61e3ab866b09964e72a9f34513
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-26 12:10:41 +00:00
Qais Yousef
a2963aef6c
Fix wrong uclamp setting am: 5ec2a126fe
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/pantah/+/22876742
Change-Id: If6269677dd1a9d72a9a9726b0388beecfe522e5b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-26 11:32:13 +00:00
Qais Yousef
73480d0c1a
Fix wrong uclamp setting am: 5ec2a126fe
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/pantah/+/22876742
Change-Id: I57882c6650ccb2b54a54be6e5db80f5aeb52ce7b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-26 11:32:11 +00:00
Qais Yousef
5ec2a126fe
Fix wrong uclamp setting
...
Bug: 279708843
Signed-off-by: Qais Yousef <qyousef@google.com>
Change-Id: I017e5e3a8b7d50541791876f9b29f8bd33434e10
2023-04-26 10:40:11 +00:00