Xin Li
b398916a51
[automerger skipped] Merge Android 14 QPR1 am: ad5cc178e1
-s ours
...
am skip reason: Merged-In I3b4d08e3a3fd62a4887a518e9ad93294700693b3 with SHA-1 e2d2ed85ed
is already in history
Original change: https://android-review.googlesource.com/c/device/google/shusky/+/2865655
Change-Id: Ib1368427030a68a3737fabec00f5884570de38e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-11 21:16:36 +00:00
George Chang
e42346cb41
[NFC] Update sku id for shiba am: 66faa9c03a
...
Original change: https://android-review.googlesource.com/c/device/google/shusky/+/2859065
Change-Id: I64f46eaa8e5a8b7db691f720d6c7b216b47cedc6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-11 18:51:02 +00:00
Roshan Pius
6678bbd076
Merge "Revert "shusky(nfc): Modify NFC overlays for NFC apex"" into main am: 0750e5b918
...
Original change: https://android-review.googlesource.com/c/device/google/shusky/+/2817311
Change-Id: I38b83146e5fd603ad2104d0f8ef438c23fd2172e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-11 18:50:50 +00:00
Roshan Pius
fb1f42b7c8
[automerger skipped] Revert "shusky: Replace NFC app with NFC apex" am: 18ec58ff4d
-s ours
...
am skip reason: skipped by user rpius
Original change: https://android-review.googlesource.com/c/device/google/shusky/+/2816777
Change-Id: I1cad326d9fd0a654a30a9fea67e12602bc443e7e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-11 18:50:47 +00:00
Xin Li
ad5cc178e1
Merge Android 14 QPR1
...
Merged-In: I3b4d08e3a3fd62a4887a518e9ad93294700693b3
Bug: 315507370
Change-Id: Idac49a7a1c71b017efadae2ea3d58422e9b41093
2023-12-08 13:15:54 -08:00
Xin Li
e2d2ed85ed
Merge UQ1A.231205.015
...
Bug: 308969284
Merged-In: I38bce6825ac29b93a6691cee6cca312be3db874e
Change-Id: I3b4d08e3a3fd62a4887a518e9ad93294700693b3
2023-12-07 15:47:37 -08:00
George Chang
66faa9c03a
[NFC] Update sku id for shiba
...
Bug: 314858460
Test: manual
Change-Id: Iea3260a0e8b1679db0e3a2e5cf32d3d54c904ae7
2023-12-05 08:08:05 +00:00
Roshan Pius
9a64e8e194
Revert "shusky: Replace NFC app with NFC apex"
...
This reverts commit 20a2f7b30c
.
Reason for revert: Needed for revert topic: https://android-review.git.corp.google.com/q/topic:%22nfc_apex_revert%22
Bug: 309867188
Test: None
Merged-In: Ie332e184ac83dcecac3eb62f8b17a683f22c9575
Change-Id: Id037ef8567ac6d0fd6fd15f6c625758b41181161
2023-11-09 04:17:26 +00:00
Roshan Pius
0750e5b918
Merge "Revert "shusky(nfc): Modify NFC overlays for NFC apex"" into main
2023-11-08 21:16:20 +00:00
Roshan Pius
877024c783
Revert "shusky(nfc): Modify NFC overlays for NFC apex"
...
Revert submission 25189355-nfc_overlay
Reason for revert: Causing bootloop with signed builds
Reverted changes: /q/submissionid:25189355-nfc_overlay
Bug: 309117462
Test: Compiles, device boots up
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:d92852d6470408275fb7e4072188e70ca316c27a )
Merged-In: I08a0c9967cd5da77d59ef60627b793efcf2d8377
Change-Id: I08a0c9967cd5da77d59ef60627b793efcf2d8377
NOTE FOR REVIEWERS - errors occurred while applying the patch.
PLEASE REVIEW CAREFULLY.
Errors:
Error applying patch in device-husky.mk, hunk HunkHeader[427,6->427,3]: Hunk cannot be applied
Error applying patch in device-shiba.mk, hunk HunkHeader[393,6->393,3]: Hunk cannot be applied
Error applying patch in husky/overlay/packages/apps/Nfc/res/values/config.xml: Cannot perform UNIFIED action which overrides an existing file
Error applying patch in husky/rro_overlays/NfcOverlay/Android.bp: Cannot perform UNIFIED action on a non-existent file
Error applying patch in husky/rro_overlays/NfcOverlay/AndroidManifest.xml: Cannot perform UNIFIED action on a non-existent file
Error applying patch in husky/rro_overlays/NfcOverlay/OWNERS: Cannot perform UNIFIED action on a non-existent file
Error applying patch in husky/rro_overlays/NfcOverlay/res/values/config.xml: Cannot perform UNIFIED action on a non-existent file
Error applying patch in shiba/overlay/packages/apps/Nfc/res/values/config.xml: Cannot perform UNIFIED action which overrides an existing file
Error applying patch in shiba/rro_overlays/NfcOverlay/Android.bp: Cannot perform UNIFIED action on a non-existent file
Error applying patch in shiba/rro_overlays/NfcOverlay/AndroidManifest.xml: Cannot perform UNIFIED action on a non-existent file
Error applying patch in shiba/rro_overlays/NfcOverlay/OWNERS: Cannot perform UNIFIED action on a non-existent file
Error applying patch in shiba/rro_overlays/NfcOverlay/res/values/config.xml: Cannot perform UNIFIED action on a non-existent file
Original patch:
From d92852d647
Mon Sep 17 00:00:00 2001
From: Roshan Pius <rpius@google.com>
Date: Sat, 04 Nov 2023 19:00:59 +0000
Subject: [PATCH] Revert "shusky(nfc): Modify NFC overlays for NFC apex"
Revert submission 25189355-nfc_overlay
Reason for revert: Causing bootloop with signed builds
Reverted changes: /q/submissionid:25189355-nfc_overlay
Bug: 309117462
Change-Id: I08a0c9967cd5da77d59ef60627b793efcf2d8377
Test: Compiles, device boots up
---
2023-11-06 19:37:27 +00:00
Roshan Pius
18ec58ff4d
Revert "shusky: Replace NFC app with NFC apex"
...
Revert submission 24993894-cherrypicker-L80100000963393177:N49200001411943056
Reason for revert: Causing bootloop with signed builds
Reverted changes: /q/submissionid:24993894-cherrypicker-L80100000963393177:N49200001411943056
Bug: 309117462
Test: Compiles, device boots up
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:4454d4b92ac97fe91792387de75783dbca2d96d5 )
Merged-In: Ie332e184ac83dcecac3eb62f8b17a683f22c9575
Change-Id: Ie332e184ac83dcecac3eb62f8b17a683f22c9575
NOTE FOR REVIEWERS - errors occurred while applying the patch.
PLEASE REVIEW CAREFULLY.
Errors:
Error applying patch in device-husky.mk, hunk HunkHeader[87,7->87,7]: Hunk cannot be applied
Error applying patch in device-ripcurrent.mk, hunk HunkHeader[71,7->71,7]: Hunk cannot be applied
Error applying patch in device-shiba.mk, hunk HunkHeader[70,7->70,7]: Hunk cannot be applied
Original patch:
From 4454d4b92a
Mon Sep 17 00:00:00 2001
From: Roshan Pius <rpius@google.com>
Date: Sat, 04 Nov 2023 14:58:26 +0000
Subject: [PATCH] Revert "shusky: Replace NFC app with NFC apex"
Revert submission 24993894-cherrypicker-L80100000963393177:N49200001411943056
Reason for revert: Causing bootloop with signed builds
Reverted changes: /q/submissionid:24993894-cherrypicker-L80100000963393177:N49200001411943056
Bug: 309117462
Change-Id: Ie332e184ac83dcecac3eb62f8b17a683f22c9575
Test: Compiles, device boots up
---
2023-11-06 19:37:15 +00:00
Android Build Coastguard Worker
4458f0bf68
Merge cherrypicks of ['googleplex-android-review.googlesource.com/25241713'] into udc-qpr1-release.
...
Change-Id: Ifd37a56f1cb79098f2c1fe370451f11966400a7f
2023-11-02 20:26:31 +00:00
Wayne Lin
ccea197344
gps: set high accuracy shape mode to 1
...
Only support CP LPP HA GAD shape for TMO
Bug: 308489551
Test: CP LPP pass in carrier LAB
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:6f2da6ead27e3ea2a8cbee2c5deb942c05141474 )
Merged-In: I38bce6825ac29b93a6691cee6cca312be3db874e
Change-Id: I38bce6825ac29b93a6691cee6cca312be3db874e
2023-11-02 20:25:41 +00:00
Android Build Coastguard Worker
f84e36b6e1
Merge cherrypicks of ['googleplex-android-review.googlesource.com/25010336', 'googleplex-android-review.googlesource.com/25007722'] into udc-qpr1-release.
...
Change-Id: Ie0576b884f35bd44748041b3e89a28117eaaf8f2
2023-10-27 03:36:17 +00:00
Ankur Bakshi
d667847313
Update husky SVN to 6
...
Bug: 302612466
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:2e27f637a4edd6fd99a21162ecce847106fecc47 )
Merged-In: Id8f52d6abb4c83ff3d862347c3100a18b5806d45
Change-Id: Id8f52d6abb4c83ff3d862347c3100a18b5806d45
2023-10-27 03:34:02 +00:00
Ankur Bakshi
5c500cb5b0
Update shiba SVN to 6
...
Bug: 302612466
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:d9e15f1bfcd2059140f81aa5e40440db98aab53e )
Merged-In: Id531d288fc06bf7c488799287f5d93dae77bc1f3
Change-Id: Id531d288fc06bf7c488799287f5d93dae77bc1f3
2023-10-27 03:33:53 +00:00
Roshan Pius
20a2f7b30c
shusky: Replace NFC app with NFC apex
...
Bug: 303286040
Test: Compiles
Change-Id: Id4e1b40e5a077f8e0f1e342e01d28a9a1a34c4d0
2023-10-24 09:30:47 -07:00
Android Build Coastguard Worker
b472125c27
Snap for 10949315 from 9c6b0e0640
to udc-qpr1-release
...
Change-Id: I05b7fc57347fdd24b2f11df47531ebea566774b7
2023-10-14 01:07:18 +00:00
Ankur Bakshi
02a4549493
Merge "Update husky SVN to 5" into udc-qpr-dev am: 9c6b0e0640
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/shusky/+/25010603
Change-Id: I63cd580a7eb75bd4bb5613eaa05a6eb7e1ca4035
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-13 21:43:56 +00:00
Ankur Bakshi
31c80660f4
Update shiba SVN to 5 am: 8d75e79214
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/shusky/+/25007045
Change-Id: I9be78178e8be343193a8d273502e791f9fe04b78
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-13 21:43:25 +00:00
Ankur Bakshi
9c6b0e0640
Merge "Update husky SVN to 5" into udc-qpr-dev
2023-10-13 21:11:01 +00:00
Ankur Bakshi
ef61c564f8
Update husky SVN to 5
...
Bug: 302612466
Change-Id: I79dc78554b998cf871dc839f81669e29b5065836
2023-10-10 22:46:11 +00:00
Ankur Bakshi
8d75e79214
Update shiba SVN to 5
...
Bug: 302612466
Change-Id: Ia71e9683bae5f106c382aaf0a1e6af9ddf30197b
2023-10-10 22:31:08 +00:00
Android Build Coastguard Worker
5c3d15f889
Snap for 10909010 from ac5f43c32b
to udc-qpr1-release
...
Change-Id: I6d826d0a5e8500e795a0a6f4cb1faaccc8dcdb97
2023-10-05 23:03:14 +00:00
Austin Delgado
8c419ceb24
Update Husky bounding box to 10x10 am: ac5f43c32b
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/shusky/+/24924665
Change-Id: I8ed566ef0cad2d7686761fb922ab1ab8927f900e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-05 19:39:02 +00:00
Austin Delgado
ac5f43c32b
Update Husky bounding box to 10x10
...
Bug: 303089534
Test: N/A
Change-Id: Ie94a884280be50b20f0fcb13d62fb98e1df86e19
2023-10-03 17:13:57 +00:00
Android Build Coastguard Worker
0239f87627
Snap for 10877629 from 9e97c64663
to udc-qpr1-release
...
Change-Id: Ia62a0ff6b1158aab42a75d5f2a66fdcecbcc3f5b
2023-09-28 23:03:02 +00:00
David Kimmel
8f3404aba2
Merge "Game Mode Sched lib affinity" into udc-qpr-dev am: 9e97c64663
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/shusky/+/24855438
Change-Id: I53796b42d6d65bddb6903a3edb33c840374816f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-28 19:38:44 +00:00
David Kimmel
9e97c64663
Merge "Game Mode Sched lib affinity" into udc-qpr-dev
2023-09-28 18:12:27 +00:00
David Kimmel
0c21866e59
Game Mode Sched lib affinity
...
Bug: 170648047
Test: sched / hints applied correctly
Change-Id: I50b21880a671cb4b40110bc7ac3d75de6e2dc946
Signed-off-by: David Kimmel <davidkimmel@google.com>
2023-09-28 07:53:23 -07:00
Qais Yousef
24581e88f4
powerhint.json: Undo uclamp_max tuning in LAUNCH_EXTEND am: 271412790a
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/shusky/+/24879527
Change-Id: I3160f0b493bf2c493682206a4a01359ff139b1f8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-28 03:57:48 +00:00
Qais Yousef
271412790a
powerhint.json: Undo uclamp_max tuning in LAUNCH_EXTEND
...
Bug: 301807825
Signed-off-by: Qais Yousef <qyousef@google.com>
Change-Id: I0f0b6752c76f0f6c5f725801f91c57f8f1e289bf
2023-09-27 22:28:39 +00:00
Android Build Coastguard Worker
d832d9f6a5
Snap for 10859301 from 9ee10fbd54
to udc-qpr1-release
...
Change-Id: I7993d9c6497433a17a0484b123b745fd1855e41a
2023-09-25 23:03:15 +00:00
Treehugger Robot
a1b8b31cdc
Merge "Enable tapered dvfs headroom in battery saver and thermal" into udc-qpr-dev am: 9ee10fbd54
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/shusky/+/24850932
Change-Id: I4719db20d42ef2ecfcfb733e45e99b1934e7ece0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-25 18:11:53 +00:00
Wei Wang
50756c4f07
Merge "powerhint.json: Reset bg_uclamp_max on LAUNCH" into udc-qpr-dev am: 3ca0943efd
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/shusky/+/24853814
Change-Id: I47a6d83c388be5b0a74e3d6abc993666e4fcdb41
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-25 18:08:06 +00:00
Treehugger Robot
9ee10fbd54
Merge "Enable tapered dvfs headroom in battery saver and thermal" into udc-qpr-dev
2023-09-25 17:25:11 +00:00
Wei Wang
3ca0943efd
Merge "powerhint.json: Reset bg_uclamp_max on LAUNCH" into udc-qpr-dev
2023-09-25 17:15:01 +00:00
Qais Yousef
2ce3ab61b8
powerhint.json: Reset bg_uclamp_max on LAUNCH
...
And disable uclamp_max_filter so that we don't accidentally impact
LAUNCH time.
Bug: 301807825
Signed-off-by: Qais Yousef <qyousef@google.com>
Change-Id: I913b50fb6e2896de96873e550e6299b7294f6bec
2023-09-25 16:02:46 +00:00
paulsu
aecb9d8989
Enable tapered dvfs headroom in battery saver and thermal
...
Bug: 295992028
Test: Boot to home
Change-Id: I04e5b286e2fb5853bd0206f8024807fe7bcd11a4
Signed-off-by: paulsu <paulsu@google.com>
2023-09-25 08:33:35 +00:00
Kimi Hsu
a992c274ec
Merge "Update camera cutout and cutout protection" into udc-qpr-dev am: d9f975082e
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/shusky/+/24484214
Change-Id: I92ac81b89ff531a87bdf6e4ac576e3e04a40c609
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-25 04:33:32 +00:00
Kimi Hsu
d9f975082e
Merge "Update camera cutout and cutout protection" into udc-qpr-dev
2023-09-25 04:08:35 +00:00
Android Build Coastguard Worker
dcbf37211c
Snap for 10853649 from d28442cf28
to udc-qpr1-release
...
Change-Id: Ic99256fbc7d496e5fdde44725e44a1c922f4cfbc
2023-09-23 21:02:52 +00:00
Peter Lin
bfea3bcaec
Merge "[RESTRICT AUTOMERGE] set normal brightness controller to ture" into udc-qpr-dev am: d28442cf28
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/shusky/+/24802235
Change-Id: I3f997fbc02ae16c65e76ccda0662bc2f6f3fd997
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-22 23:40:24 +00:00
Peter Lin
e241f9dedc
[RESTRICT AUTOMERGE] set normal brightness controller to ture am: 4670216e61
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/shusky/+/24802235
Change-Id: I4b2d43131035767b32bcf51785607dc6a61c276f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-22 23:40:21 +00:00
Peter Lin
d28442cf28
Merge "[RESTRICT AUTOMERGE] set normal brightness controller to ture" into udc-qpr-dev
2023-09-22 23:04:13 +00:00
Kimi Hsu
0a844f74be
Update camera cutout and cutout protection
...
Bug: 296322078
Test: Setup faceunlock and turn on/off screen
Change-Id: I7f153b56314436c0dd7dc9fa424093a445066738
2023-09-22 04:22:25 +00:00
Peter Lin
4670216e61
[RESTRICT AUTOMERGE] set normal brightness controller to ture
...
Bug: 300259502
test: check dumpsys display
Change-Id: Ia7811a271eb6072927aba3edec8bec11d8781468
2023-09-22 00:46:02 +00:00
Android Build Coastguard Worker
050beded97
Snap for 10844344 from 75511e55b7
to udc-qpr1-release
...
Change-Id: I463a1da02c268891b3b2f4f06e30d9e7d65cfb78
2023-09-21 23:03:01 +00:00
Treehugger Robot
10e33c1b99
Merge "DO NOT MERGE: Disable 32k dual mic support on P23 project" into udc-qpr-dev am: 75511e55b7
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/shusky/+/24820292
Change-Id: I68a50f85891c5c7ab9e870dca6b10355ddd689ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-21 11:28:22 +00:00
Alice Kuo
3e92dbe0b5
DO NOT MERGE: Disable 32k dual mic support on P23 project am: be574d03e8
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/shusky/+/24820292
Change-Id: Iae9af548f4fe80cdfa6b0cc8f638ab6110de88a6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-21 11:28:19 +00:00