Treehugger Robot
402d34b6e9
Merge changes from topic "cherrypicker-L23200030000689269:N91700030011100373" into main am: 9e58dbf4b2
am: 077e772133
...
Original change: https://android-review.googlesource.com/c/device/google/pantah/+/2864191
Change-Id: I92231683fc6a954a552e3b8a8e5c8ae3fd9aa95d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-11 22:40:22 +00:00
Roshan Pius
b23abea540
Revert^2 "pantah: Replace NFC app with NFC apex" am: 61abf7319e
am: 704a52bfb4
...
Original change: https://android-review.googlesource.com/c/device/google/pantah/+/2864190
Change-Id: Ie20fcfe3a22d9544fcb5940e4d2d901bcdda71ac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-11 22:40:05 +00:00
Treehugger Robot
077e772133
Merge changes from topic "cherrypicker-L23200030000689269:N91700030011100373" into main am: 9e58dbf4b2
...
Original change: https://android-review.googlesource.com/c/device/google/pantah/+/2864191
Change-Id: I83187ac18ba0c729644736e97f0ff01c240a9c8c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-11 22:18:26 +00:00
Roshan Pius
704a52bfb4
Revert^2 "pantah: Replace NFC app with NFC apex" am: 61abf7319e
...
Original change: https://android-review.googlesource.com/c/device/google/pantah/+/2864190
Change-Id: I215d22735f124b86d7c14857464036cd898ac848
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-11 22:18:10 +00:00
Xin Li
a40103a204
[automerger skipped] Merge Android 14 QPR1 am: 3ae2ebb35a
-s ours am: c826e7064c
-s ours
...
am skip reason: Merged-In I492d68878649c5553a7996482fda2e36e820e440 with SHA-1 4374f3bcdb
is already in history
Original change: https://android-review.googlesource.com/c/device/google/pantah/+/2865151
Change-Id: Iac9e14e36fa72228febcb1656babb168912143e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-11 22:02:27 +00:00
Treehugger Robot
9e58dbf4b2
Merge changes from topic "cherrypicker-L23200030000689269:N91700030011100373" into main
...
* changes:
Revert^2 "pantah(nfc): Modify NFC overlays for NFC apex"
Revert^2 "pantah: Replace NFC app with NFC apex"
2023-12-11 22:00:34 +00:00
Xin Li
c826e7064c
[automerger skipped] Merge Android 14 QPR1 am: 3ae2ebb35a
-s ours
...
am skip reason: Merged-In I492d68878649c5553a7996482fda2e36e820e440 with SHA-1 4374f3bcdb
is already in history
Original change: https://android-review.googlesource.com/c/device/google/pantah/+/2865151
Change-Id: I7fd964ba65b15656be44d046bc84d45cdc98ea51
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-11 21:16:37 +00:00
Ankur Bakshi
77141f29c5
Update panther SVN to 43
...
Bug: 313797924
Change-Id: Id3546da8690b20b484cec286dfa336a354d9f575
2023-12-11 19:52:54 +00:00
Xin Li
3ae2ebb35a
Merge Android 14 QPR1
...
Merged-In: I492d68878649c5553a7996482fda2e36e820e440
Bug: 315507370
Change-Id: I43fb967f2d0cf7032ccd54167d36be68246e1d11
2023-12-08 13:13:32 -08:00
Xin Li
9fd9571259
[automerger skipped] Merge UQ1A.231205.015 am: 4374f3bcdb
-s ours am: ee4ada1267
-s ours
...
am skip reason: Merged-In I075a42359d9cdc1984dfb2057808fb1a9bd8e909 with SHA-1 a1eee239bb
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/device/google/pantah/+/25591401
Change-Id: I095faf4aacbb4510ddd616e0f278de0e8e8216ac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-08 08:51:05 +00:00
Xin Li
ee4ada1267
[automerger skipped] Merge UQ1A.231205.015 am: 4374f3bcdb
-s ours
...
am skip reason: Merged-In I075a42359d9cdc1984dfb2057808fb1a9bd8e909 with SHA-1 a1eee239bb
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/device/google/pantah/+/25591401
Change-Id: Ieb7fc27ae231342f00bfcf8e1bdc90ad72ea617b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-08 08:21:18 +00:00
Xin Li
4374f3bcdb
Merge UQ1A.231205.015
...
Bug: 308969284
Merged-In: I075a42359d9cdc1984dfb2057808fb1a9bd8e909
Change-Id: I492d68878649c5553a7996482fda2e36e820e440
2023-12-07 15:47:21 -08:00
Yvonne Yip
4414d256ef
powerhint: game mode tuning
...
Test: Load powerhint file on device and verify tuned parameters are
default. Start Subway Surfers game and verify tuned parameters are
expected tuned values. Switch away from game, and quit the game, and
verify tuned parameters return to default.
Bug: 295636226
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:c1688eb48e4de7f6de344f406e3880e0a46ebcaa )
Merged-In: I7b5346f05dc06c18f986c52805bfbb979ae173f5
Change-Id: I7b5346f05dc06c18f986c52805bfbb979ae173f5
2023-12-07 18:45:56 +00:00
Yvonne Yip
cb784ede31
powerhint: add game mode tuning nodes
...
Add down_rate_limit_us nodes, tapered_dvfs_headroom nodes.
Test: build
Bug: 295636226
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:ed55bd67b0a7cdb1521f4df70b7c854246aa4492 )
Merged-In: I826da5058916abb1e676774ef19fe05710588392
Change-Id: I826da5058916abb1e676774ef19fe05710588392
2023-12-07 18:45:56 +00:00
Roshan Pius
7ca0bc8982
Revert^2 "pantah(nfc): Modify NFC overlays for NFC apex"
...
08fbfb05f1
Bug: 303286040
Test: Compiles
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:2280e6ea3db5e414f1ace9734d3066d9b3eb4654 )
Merged-In: I4ea4668bd7de33fa5a6c80b742dab0a6b27b4936
Change-Id: I4ea4668bd7de33fa5a6c80b742dab0a6b27b4936
Change-Id: Ie620addb17b635f30a6d79661cd3f0ded2afe0df
2023-12-07 10:24:27 -08:00
Roshan Pius
61abf7319e
Revert^2 "pantah: Replace NFC app with NFC apex"
...
3000cdee0e
Bug: 303286040
Test: Compiles
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:aa3c94e272d388cc559f58faabb85caa2eeef48e )
Merged-In: I4da74311505445715132b84afb557ec7e126abac
Change-Id: I4da74311505445715132b84afb557ec7e126abac
Change-Id: I39f927d3cee2ec84616ecb56704fc2b5d4d4896e
2023-12-07 10:23:55 -08:00
Roshan Pius
2280e6ea3d
Revert^2 "pantah(nfc): Modify NFC overlays for NFC apex"
...
08fbfb05f1
Bug: 303286040
Test: Compiles
Change-Id: I4ea4668bd7de33fa5a6c80b742dab0a6b27b4936
2023-12-04 13:56:01 -08:00
Roshan Pius
aa3c94e272
Revert^2 "pantah: Replace NFC app with NFC apex"
...
3000cdee0e
Bug: 303286040
Test: Compiles
Change-Id: I4da74311505445715132b84afb557ec7e126abac
2023-12-04 11:55:22 -08:00
Ankur Bakshi
de53058326
Update panther SVN to 42 am: e66288cae4
am: 83be291c08
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/pantah/+/25499294
Change-Id: I4817dd3d39e8c97277cdd9f44598643f44e5fab2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-29 23:05:49 +00:00
Ankur Bakshi
c72ed81255
Update panther SVN to 41 am: 1695374b64
am: fc4b3d6734
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/pantah/+/25499293
Change-Id: I768390eb9dcf7daca4c757ff477b8299b3826143
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-29 23:05:44 +00:00
Ankur Bakshi
736f230fcf
Update cheetah SVN to 42 am: 75a9c0a8ef
am: ea48dcac11
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/pantah/+/25496450
Change-Id: I612ae5f30cef2df2017de9522691d1bc0b08f974
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-29 23:05:33 +00:00
Ankur Bakshi
a2e6c7482e
Update cheetah SVN to 41 am: 119db5acb6
am: a42ef94268
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/pantah/+/25496610
Change-Id: I5eac9194c36cdeadd51bb308081fdca79ea4be5a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-29 23:05:24 +00:00
Ankur Bakshi
83be291c08
Update panther SVN to 42 am: e66288cae4
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/pantah/+/25499294
Change-Id: Ib21aa8491880814e9c0d0093fa53b9db61838201
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-29 22:35:26 +00:00
Ankur Bakshi
fc4b3d6734
Update panther SVN to 41 am: 1695374b64
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/pantah/+/25499293
Change-Id: I9ae88f0d86dad830d1879235acac5df4402091a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-29 22:35:21 +00:00
Ankur Bakshi
ea48dcac11
Update cheetah SVN to 42 am: 75a9c0a8ef
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/pantah/+/25496450
Change-Id: Ib65377cd887b5a5267b92ce7e8e1f5705b96765b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-29 22:35:10 +00:00
Ankur Bakshi
a42ef94268
Update cheetah SVN to 41 am: 119db5acb6
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/pantah/+/25496610
Change-Id: I99bc75be6b2a1b70a65f44688ae76a2641f92c0c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-29 22:35:00 +00:00
Ankur Bakshi
e66288cae4
Update panther SVN to 42
...
Bug: 313696499
Change-Id: I9eec5502196e2b1b681152a604ba0e0d64a37ea8
2023-11-29 22:08:33 +00:00
Ankur Bakshi
1695374b64
Update panther SVN to 41
...
Bug: 313696499
Change-Id: Ic6534eee5f78ca57f7f9529b1c35ccfb3cafae74
2023-11-29 22:08:33 +00:00
Ankur Bakshi
75a9c0a8ef
Update cheetah SVN to 42
...
Bug: 313696499
Change-Id: I7658cd580290f964bc5391e0874cf3e8bece6a8c
2023-11-29 06:29:35 +00:00
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