Ankur Bakshi
119db5acb6
Update cheetah SVN to 41
...
Bug: 313696499
Change-Id: If57b5ff9871f4daecae1b2219e7d3fcb456dde5e
2023-11-29 06:26:59 +00:00
Shin-Yu Wang
2e4890b8ea
Revert "Update idle timer setting"
...
This reverts commit a008293ba5
.
Reason for revert: broken test b/312417871
Bug: 307593860
Change-Id: Ia6db7b3fd4e22dce5443877756f9881d48214019
2023-11-24 12:36:43 +00:00
Treehugger Robot
5c347f357f
Merge "Remove unused Android.mk under device/google/pantah am: 01c6ee7de8
am: 01a89c3591
" into udc-qpr-dev-plus-aosp am: 1bc3f07cf5
...
Original change: undetermined
Change-Id: I3a39aca8c069e00f7d6a068acd362cbc66577317
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-21 04:03:41 +00:00
Treehugger Robot
1bc3f07cf5
Merge "Remove unused Android.mk under device/google/pantah am: 01c6ee7de8
am: 01a89c3591
" into udc-qpr-dev-plus-aosp
2023-11-21 03:25:30 +00:00
Herbert Xue
2691f6048d
Remove unused Android.mk under device/google/pantah am: 01c6ee7de8
am: 1264b2767b
am: 5bba786d8d
...
Original change: https://android-review.googlesource.com/c/device/google/pantah/+/2836176
Change-Id: I1e1cba92381971162281cd593c16e65f1d513282
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-21 03:14:57 +00:00
Herbert Xue
5bba786d8d
Remove unused Android.mk under device/google/pantah am: 01c6ee7de8
am: 1264b2767b
...
Original change: https://android-review.googlesource.com/c/device/google/pantah/+/2836176
Change-Id: Iba7d7c3e7e2ce1d240a3665ea944f09cc9955303
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-21 02:43:51 +00:00
Herbert Xue
a82de9d5e6
Remove unused Android.mk under device/google/pantah am: 01c6ee7de8
am: 01a89c3591
...
Original change: https://android-review.googlesource.com/c/device/google/pantah/+/2836176
Change-Id: I7de75a300ac3448ba1cd9c146dfbfca097f595c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-20 03:55:02 +00:00
Herbert Xue
1264b2767b
Remove unused Android.mk under device/google/pantah am: 01c6ee7de8
...
Original change: https://android-review.googlesource.com/c/device/google/pantah/+/2836176
Change-Id: I196f6b1c36c5c9862f8733488efcfe0baf1fd206
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-20 03:24:06 +00:00
Herbert Xue
01a89c3591
Remove unused Android.mk under device/google/pantah am: 01c6ee7de8
...
Original change: https://android-review.googlesource.com/c/device/google/pantah/+/2836176
Change-Id: I70f636709f33f14a39b30c7fe3e75e3796bbdd2b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-20 03:23:54 +00:00
Shin-Yu Wang
a008293ba5
Update idle timer setting
...
Bug: 307593860
Test: check result of `adb shell getprop ro.surface_flinger.set_idle_timer_ms`
Change-Id: I3cc93c3c5aa52d62672636393e4bc3e43cc4c7e4
2023-11-18 03:22:38 +00:00
Herbert Xue
01c6ee7de8
Remove unused Android.mk under device/google/pantah
...
Bug: 310091213
Test: NA
Change-Id: Ib8afe342ed74ab98923da47fa248f3e91b923820
2023-11-17 11:50:01 +08:00
Ankur Bakshi
ddf12a26c9
Update panther SVN to 40 am: e05ba05b57
am: 4532bd63fb
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/pantah/+/25364492
Change-Id: Ibde201cf844300169d05fac20ded6403b5150513
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-16 22:05:48 +00:00
Ankur Bakshi
ec8829b38d
Update cheetah SVN to 40 am: 6c10cd72b8
am: 9613b8b77b
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/pantah/+/25365067
Change-Id: I885f17b82bc4ae42747e3f8b877a3bc68a6802b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-16 22:05:42 +00:00
Ankur Bakshi
4532bd63fb
Update panther SVN to 40 am: e05ba05b57
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/pantah/+/25364492
Change-Id: I377e0a45c7e928b73f8f938a5938ee41f34868cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-16 21:35:23 +00:00
Ankur Bakshi
9613b8b77b
Update cheetah SVN to 40 am: 6c10cd72b8
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/pantah/+/25365067
Change-Id: I0cee30445562195f311cbad2e9dfe4e4fc11ff07
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-16 21:35:15 +00:00
Ankur Bakshi
e05ba05b57
Update panther SVN to 40
...
Bug: 309529736
Change-Id: I250bc0d8ce0e3df1347015466a671d2ef20becd3
2023-11-16 20:42:25 +00:00
Ankur Bakshi
6c10cd72b8
Update cheetah SVN to 40
...
Bug: 309529736
Change-Id: Ic369fc71b2993b51fe7ab017d7527f835ce55ea9
2023-11-16 20:42:25 +00:00
Ankur Bakshi
d5c1a6c74e
Update panther SVN to 39 am: 0fd147e544
am: d08e4a25fc
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/pantah/+/25341847
Change-Id: Ib3002b4355cf920737d5226033aa12238b28e46c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-16 04:59:20 +00:00
Ankur Bakshi
752ba20ac2
Update cheetah SVN to 39 am: ea419cb1ae
am: 341abbe2bd
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/pantah/+/25343873
Change-Id: I4024263fbe0a530ca84959d6d2a143f12867ce62
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-16 04:59:09 +00:00
Ankur Bakshi
d08e4a25fc
Update panther SVN to 39 am: 0fd147e544
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/pantah/+/25341847
Change-Id: I71df92e324c2e5eebdbdcca69e25d5ff44fb7c3d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-16 04:29:10 +00:00
Ankur Bakshi
341abbe2bd
Update cheetah SVN to 39 am: ea419cb1ae
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/pantah/+/25343873
Change-Id: I08e425aa24bc70a22653695612c8885b3c3e33f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-16 04:29:00 +00:00
Ankur Bakshi
0fd147e544
Update panther SVN to 39
...
Bug: 309529736
Change-Id: Ifb27544932f89b0e2fd3acfb63316af9a7dd2109
2023-11-16 03:41:42 +00:00
Ankur Bakshi
ea419cb1ae
Update cheetah SVN to 39
...
Bug: 309529736
Change-Id: I6aa90a8ebddb1eab4c26a361569643ce5ed665fe
2023-11-16 03:41:42 +00:00
Ankur Bakshi
0452b56f70
Update panther SVN to 38 am: 2b4350d830
am: 4c408c5e21
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/pantah/+/25291798
Change-Id: Ifa70ce329ec29bc52efe1ef190008be62de55447
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-11 02:10:36 +00:00
Ankur Bakshi
5e1ca9f831
Update cheetah SVN to 38 am: deb295c2de
am: e3b7a96fe2
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/pantah/+/25293133
Change-Id: Id95424f125dd0fab8d27e391400d0b4f604b30cc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-11 02:10:29 +00:00
Ankur Bakshi
4c408c5e21
Update panther SVN to 38 am: 2b4350d830
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/pantah/+/25291798
Change-Id: I994bb7c6dd6e188303029c12cb611371e3d5d88a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-11 01:39:09 +00:00
Ankur Bakshi
e3b7a96fe2
Update cheetah SVN to 38 am: deb295c2de
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/pantah/+/25293133
Change-Id: If9aad1560c7d2003e00f5f515211c771c068784e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-11 01:39:02 +00:00
Ankur Bakshi
2b4350d830
Update panther SVN to 38
...
Bug: 302612466
Change-Id: I34ce3669c65639ee5059b181a098ef951b51ca74
2023-11-11 00:56:31 +00:00
Ankur Bakshi
deb295c2de
Update cheetah SVN to 38
...
Bug: 302612466
Change-Id: I7a139e86b6773d68e483dc5cb8182355d691fb61
2023-11-10 23:17:59 +00:00
Roshan Pius
0110b9967a
[automerger skipped] Merge "Revert "pantah(nfc): Modify NFC overlays for NFC apex"" into main am: 6efff16bfc
am: e699a8c761
-s ours am: f78b5c3137
-s ours
...
am skip reason: Merged-In Idced173f9063bed7899354d20553b3694579329a with SHA-1 6d7b0b8cec
is already in history
Original change: https://android-review.googlesource.com/c/device/google/pantah/+/2818127
Change-Id: I4f4883b1d1fcd1df5747b266a5a9b6887efafcd9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-08 23:34:42 +00:00
Roshan Pius
d23f6546ed
[automerger skipped] Revert "pantah: Replace NFC app with NFC apex" am: 703decc970
am: 05035f8f52
am: 0879831a4f
-s ours
...
am skip reason: Merged-In I9adf4d5adf38a986fb95ca43e307914ae7439394 with SHA-1 3000cdee0e
is already in history
Original change: https://android-review.googlesource.com/c/device/google/pantah/+/2818917
Change-Id: I1058fb45e50ee67bbe2457d2aead1fbc6a9b8f9a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-08 23:34:23 +00:00
Roshan Pius
7722c5a079
[automerger skipped] Merge "Revert "pantah(nfc): Modify NFC overlays for NFC apex"" into main am: 6efff16bfc
am: b21db32598
am: a70f5a11f5
-s ours
...
am skip reason: Merged-In Idced173f9063bed7899354d20553b3694579329a with SHA-1 08fbfb05f1
is already in history
Original change: https://android-review.googlesource.com/c/device/google/pantah/+/2818127
Change-Id: Icdb27ffc153cedd0ac6c3ac255352a38dc0fe35b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-08 23:30:58 +00:00
Roshan Pius
93e4b95cde
[automerger skipped] Revert "pantah: Replace NFC app with NFC apex" am: 703decc970
am: 8797f7365c
am: 1989eb2ad4
-s ours
...
am skip reason: Merged-In I9adf4d5adf38a986fb95ca43e307914ae7439394 with SHA-1 3000cdee0e
is already in history
Original change: https://android-review.googlesource.com/c/device/google/pantah/+/2818917
Change-Id: I1d6ea3e88b87e7ddd7cf3832ed6f88e9d39df944
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-08 23:30:36 +00:00
Roshan Pius
f78b5c3137
[automerger skipped] Merge "Revert "pantah(nfc): Modify NFC overlays for NFC apex"" into main am: 6efff16bfc
am: e699a8c761
-s ours
...
am skip reason: Merged-In Idced173f9063bed7899354d20553b3694579329a with SHA-1 6d7b0b8cec
is already in history
Original change: https://android-review.googlesource.com/c/device/google/pantah/+/2818127
Change-Id: I762d0e4b8dbad34068becad59beb9ba576183fec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-08 22:48:58 +00:00
Roshan Pius
0879831a4f
Revert "pantah: Replace NFC app with NFC apex" am: 703decc970
am: 05035f8f52
...
Original change: https://android-review.googlesource.com/c/device/google/pantah/+/2818917
Change-Id: I7676ba733c665305972fb1292d0bc031d97a76cb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-08 22:48:41 +00:00
Roshan Pius
a70f5a11f5
Merge "Revert "pantah(nfc): Modify NFC overlays for NFC apex"" into main am: 6efff16bfc
am: b21db32598
...
Original change: https://android-review.googlesource.com/c/device/google/pantah/+/2818127
Change-Id: I8dc4e06695dafb980ac4c1adf2f5535abf51f2bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-08 22:46:25 +00:00
Roshan Pius
1989eb2ad4
Revert "pantah: Replace NFC app with NFC apex" am: 703decc970
am: 8797f7365c
...
Original change: https://android-review.googlesource.com/c/device/google/pantah/+/2818917
Change-Id: I683fdd3e876a9e948b0f2e5bb9c863ae2b6668da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-08 22:46:06 +00:00
Roshan Pius
e699a8c761
Merge "Revert "pantah(nfc): Modify NFC overlays for NFC apex"" into main am: 6efff16bfc
...
Original change: https://android-review.googlesource.com/c/device/google/pantah/+/2818127
Change-Id: Ie543b18d69c75dff32ebf75109c54440ebe07583
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-08 21:49:09 +00:00
Roshan Pius
05035f8f52
Revert "pantah: Replace NFC app with NFC apex" am: 703decc970
...
Original change: https://android-review.googlesource.com/c/device/google/pantah/+/2818917
Change-Id: I4a5df2fe11f137be75e94dea6fc217415cfd1a2f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-08 21:48:53 +00:00
Roshan Pius
b21db32598
Merge "Revert "pantah(nfc): Modify NFC overlays for NFC apex"" into main am: 6efff16bfc
...
Original change: https://android-review.googlesource.com/c/device/google/pantah/+/2818127
Change-Id: I25723a7f52e9b5e5a6764832ca5e11cffc316f92
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-08 21:45:45 +00:00
Roshan Pius
8797f7365c
Revert "pantah: Replace NFC app with NFC apex" am: 703decc970
...
Original change: https://android-review.googlesource.com/c/device/google/pantah/+/2818917
Change-Id: Id6c763a588f2db2bfeadd80ceca5cff2c507ff00
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-08 21:45:26 +00:00
Roshan Pius
6efff16bfc
Merge "Revert "pantah(nfc): Modify NFC overlays for NFC apex"" into main
2023-11-08 21:16:20 +00:00
Poomarin Phloyphisut
66ee837817
[USB AIDL] Remove USB configuration from audio_platform_configuration.xml
...
These configs are hardcoded into audio HAL instead because it's very rarely changed.
Bug: 307439907
Test: Local Test.
Change-Id: I678d989ed60b632a7de41b0b61d6fcbfd0e6ca38
2023-11-08 11:38:40 +00:00
Roshan Pius
703decc970
Revert "pantah: 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:3000cdee0ef5284ba9fdc68bcdebedbcceb65b10 )
Merged-In: I9adf4d5adf38a986fb95ca43e307914ae7439394
Change-Id: I9adf4d5adf38a986fb95ca43e307914ae7439394
2023-11-08 00:18:16 +00:00
Roshan Pius
6d7b0b8cec
Revert "pantah(nfc): Modify NFC overlays for NFC apex"
...
Revert submission 2802548-nfc_apex
Reason for revert: Causing bootloop with signed builds
Reverted changes: /q/submissionid:2802548-nfc_apex
Bug: 309117462
Test: Compiles, device boots up
Merged-In: Idced173f9063bed7899354d20553b3694579329a
Change-Id: Idced173f9063bed7899354d20553b3694579329a
2023-11-06 19:45:50 +00:00
Roshan Pius
08fbfb05f1
Revert "pantah(nfc): Modify NFC overlays for NFC apex"
...
Revert submission 2802548-nfc_apex
Reason for revert: Causing bootloop with signed builds
Reverted changes: /q/submissionid:2802548-nfc_apex
Bug: 309117462
Test: Compiles, device boots up
(cherry picked from https://android-review.googlesource.com/q/commit:883343a5e59ad915cef349ac21c18b1470dbb777 )
Merged-In: Idced173f9063bed7899354d20553b3694579329a
Change-Id: Idced173f9063bed7899354d20553b3694579329a
2023-11-06 14:30:47 +00:00
Roshan Pius
3000cdee0e
Revert "pantah: 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: I9adf4d5adf38a986fb95ca43e307914ae7439394
Test: Compiles, device boots up
2023-11-06 14:30:47 +00:00
Greg Kaiser
2792415517
[automerger skipped] Fix lunch choices for git_main am: 5e34e006c3
am: b4426c3690
-s ours am: 345b2803e0
-s ours
...
am skip reason: Merged-In I1390f8707ed0eca0bf51112eef4b2cc4328e52a8 with SHA-1 5e34e006c3
is already in history
Original change: https://android-review.googlesource.com/c/device/google/pantah/+/2811163
Change-Id: I2871fc42d04cf1b38dc80402d825e9756e212dd5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-31 00:15:23 +00:00
Greg Kaiser
bfe8741bab
[automerger skipped] Fix lunch choices for git_main am: 5e34e006c3
am: ba708323ef
am: e2fb70f5d0
-s ours
...
am skip reason: Merged-In I1390f8707ed0eca0bf51112eef4b2cc4328e52a8 with SHA-1 b0fb9be930
is already in history
Original change: https://android-review.googlesource.com/c/device/google/pantah/+/2811163
Change-Id: I517f43f0f1feca55fee799d1d95dd7ea58602c65
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-31 00:13:26 +00:00
Greg Kaiser
345b2803e0
[automerger skipped] Fix lunch choices for git_main am: 5e34e006c3
am: b4426c3690
-s ours
...
am skip reason: Merged-In I1390f8707ed0eca0bf51112eef4b2cc4328e52a8 with SHA-1 5e34e006c3
is already in history
Original change: https://android-review.googlesource.com/c/device/google/pantah/+/2811163
Change-Id: Ib96236e208c5d3bd80bce21ee682b233f22e5fa3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-31 00:07:02 +00:00