Charles Chen
7f2d8784e4
Revert^2 Disable Settings large-screen optimization am: 653f25765f
am: d177768af3
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/pantah/+/23036418
Change-Id: I78a5ca6bf277813d0a1bbd9c492d8d1e6bf63c94
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-08 07:09:55 +00:00
Charles Chen
71acd23623
Revert^2 Disable Settings large-screen optimization am: 653f25765f
am: a590a62938
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/pantah/+/23036418
Change-Id: I90d482bf1f6441a3940160f251100d66b2f961c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-08 07:09:22 +00:00
Charles Chen
9679e885c1
Revert^2 Disable Settings large-screen optimization am: 653f25765f
am: a590a62938
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/pantah/+/23036418
Change-Id: I70fc06fd026d04c81548418baee0a8ff68a65264
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-08 07:05:28 +00:00
Charles Chen
a590a62938
Revert^2 Disable Settings large-screen optimization am: 653f25765f
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/pantah/+/23036418
Change-Id: Ia50b8b9931fcf2087e73deb89eb468dd7459c7e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-08 06:27:59 +00:00
Charles Chen
d177768af3
Revert^2 Disable Settings large-screen optimization am: 653f25765f
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/pantah/+/23036418
Change-Id: I0964ced9e59c13923fc799a9f0c83c61d4b7d58a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-08 06:23:42 +00:00
Charles Chen
653f25765f
Revert^2 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
fixes: 280606740
Test: Build, perf metrics
Test: atest LauncherIronwoodIntegrationTests:android.platform.test.scenario.launcher.integration_tests.HomescreenCustomizationTests
Test: atest SettingsMultiPaneDeepLinkTest.java
Test: run v2/aep-ironwood/suite/test-mapping-ironwood-p0-cujs via ABTD
on cheetah/oriole/panther/raven in udc-dev/master branch
Change-Id: I532ebbcdc93f13c8d4cf956b53b498be907c4349
2023-05-08 05:39:06 +00:00
Bill Yi
82a19d2fa6
[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: e65f480599
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/device/google/pantah/+/2576875
Change-Id: I640bcb75e4fb83bed4abb27563f65e3b38279691
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-05 23:15:21 +00:00
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
347f40944d
[DO NOT MERGE] vibrator: Disable PWLE capability for U am: 0302209e61
am: cc25c20403
am: 0953bd2d2a
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/pantah/+/22911813
Change-Id: Ie4445fbd6448d2e55ef392188e83a5880c86a3df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 22:34:21 +00:00
Nathan Kulczak
57bffef935
[DO NOT MERGE] vibrator: Disable PWLE capability for U am: 0302209e61
am: 81a0734190
am: 52d760eb52
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/pantah/+/22911813
Change-Id: I3fe366762d087a88d0275a7bd85cb4ac67d79e56
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 22:32:00 +00:00
Nathan Kulczak
15e5b73340
[DO NOT MERGE] vibrator: Disable PWLE capability for U am: 0302209e61
am: cc25c20403
am: 0375a99b86
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/pantah/+/22911813
Change-Id: I54c7a3cf043d1c20a6f2005d85ad5c89988dd96b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 22:31:22 +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
0953bd2d2a
[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: I8e014ab4ef5327bba31ed432272103a99ed307ad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 21:47:09 +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
e4e1a018d4
thermal: Update config for stats am: 16c067a53e
am: 55532f27d2
am: 96c93e8252
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/pantah/+/21806783
Change-Id: I4174cd38b123532835db1a4d761e1110224fa1aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 11:37:47 +00:00
sashwinbalaji
c435b54594
thermal: Update config for stats am: 16c067a53e
am: 088172f34a
am: 0d9bc85178
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/pantah/+/21806783
Change-Id: Ie6a1788077c32b6ff16e409402d82d4b7677c7c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 11:34:13 +00:00
sashwinbalaji
dca5dd7911
thermal: Update config for stats am: 16c067a53e
am: 55532f27d2
am: 6b0c92535f
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/pantah/+/21806783
Change-Id: I478c7f5f311d7561c99971beafa172c994ca5600
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 11:32:49 +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
96c93e8252
thermal: Update config for stats am: 16c067a53e
am: 55532f27d2
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/pantah/+/21806783
Change-Id: I34ec8fa5e02f21ed5fdd5749da3b0211e46a7171
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 10:51:57 +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
c9527a7f4f
Remove overlay item: country code update during setup wizard am: 85d508c7b6
am: 43073ce71c
am: 18bbc960f7
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/pantah/+/22975684
Change-Id: Ib0204b75d0f640efa86c288a430bd14938b962fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 04:01:07 +00:00
Shuibing Dai
5c263a9720
Remove overlay item: country code update during setup wizard am: 85d508c7b6
am: 43073ce71c
am: 108cc22d08
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/pantah/+/22975684
Change-Id: Iab39350893bf401bd1bf235b1d9b061ba750b523
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 03:37:44 +00:00
Shuibing Dai
9a8e83dfdb
Remove overlay item: country code update during setup wizard am: 85d508c7b6
am: fa9fad28f2
am: f9d7783879
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/pantah/+/22975684
Change-Id: I0eb3b503fae4211f3fabdd1344cd7f6ff5f72b40
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 03:33:46 +00:00
Shuibing Dai
18bbc960f7
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: I8c39c28900c8cb270322aa4ad034862272e480fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 03:12: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
Suprabh Shukla
8fe7dd850d
Add wakeup interrupt mapping am: d786ac91ca
am: be0850caa3
am: b42942cfe1
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/pantah/+/22977072
Change-Id: If6394e24680d7a23fb302b877a9ee3c63c8cf643
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 02:28:01 +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
Suprabh Shukla
afa4d1b77a
Add wakeup interrupt mapping am: d786ac91ca
am: 18d7e93f8e
am: 2dd8249c7a
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/pantah/+/22977072
Change-Id: I5dd2ef1394008f2dbd9e435d35214e49e06e8fba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 02:27:06 +00:00
Suprabh Shukla
ea2f81edad
Add wakeup interrupt mapping am: d786ac91ca
am: be0850caa3
am: 11c5154f0b
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/pantah/+/22977072
Change-Id: I6e49e4df4eee74884e9869505a871e7b102f0d60
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 02:24:09 +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
b42942cfe1
Add wakeup interrupt mapping am: d786ac91ca
am: be0850caa3
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/pantah/+/22977072
Change-Id: I366beb0c5050362966287fcaf112a636af10bd40
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 01:38:18 +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
58d7449a5f
Add aosp_cheetah_hwasan. am: dd40a981da
am: 146d223370
am: 6f995788b9
am: 8f3a0deca9
am: 6329d206fc
...
Original change: https://android-review.googlesource.com/c/device/google/pantah/+/2576771
Change-Id: I77e529b9d2a071224d1c0155ec197a92da20f3a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-03 20:23:01 +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