Commit graph

2097 commits

Author SHA1 Message Date
Automerger Merge Worker
c60a0cd61b Merge "Update bluejay SVN to 42 am: fb0f5bffce am: a4da2d5bf4" 2023-06-30 04:57:19 +00:00
Bassem Khalife
76a7a33dac Update bluejay SVN to 42 am: fb0f5bffce am: ac51c65fa9
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/23864761

Change-Id: Icbd057c5ba492bb4c25fca8acaff76e469e1fd2e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-30 04:57:13 +00:00
Bassem Khalife
d0f49bc356 Update bluejay SVN to 42 am: fb0f5bffce am: a4da2d5bf4
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/23864761

Change-Id: I07d6ff3e9deed750114bc0078b5434725e66b339
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-30 04:57:13 +00:00
Bassem Khalife
ac51c65fa9 Update bluejay SVN to 42 am: fb0f5bffce
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/23864761

Change-Id: I541343505bca8213f167d0181892e9f7022771be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-30 04:16:34 +00:00
Bassem Khalife
a4da2d5bf4 Update bluejay SVN to 42 am: fb0f5bffce
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/23864761

Change-Id: I13c46e47884518217e325354e9d58f6d7683a91a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-30 04:16:20 +00:00
Bassem Khalife
fb0f5bffce Update bluejay SVN to 42
Bug: 289414927
Change-Id: I11e9a8368b21216481ba34fdde427a7ed398acbc
2023-06-30 02:01:45 +00:00
Kame(TeYuan) Wang
218202e53b Merge "powerhint: remove the duplicate thermal powerhint settings" into udc-qpr-dev am: 4b96f59213 am: d853bef2ee
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/23717441

Change-Id: I639c83dd9bacc022182fd526804caab885fdde24
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-28 08:55:40 +00:00
Kame(TeYuan) Wang
d853bef2ee Merge "powerhint: remove the duplicate thermal powerhint settings" into udc-qpr-dev am: 4b96f59213
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/23717441

Change-Id: I093b21a89653a9282b0a224f1e799cffc0955723
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-28 08:15:42 +00:00
Kame(TeYuan) Wang
4b96f59213 Merge "powerhint: remove the duplicate thermal powerhint settings" into udc-qpr-dev 2023-06-28 07:20:00 +00:00
Xin Li
a31fbf82ff [automerger skipped] Merge Android 13 QPR3 am: 57474b8846 -s ours am: b4a4abfd8a -s ours am: 1d7f12def0 -s ours am: 90c9ee57a9 -s ours am: b4178face8 -s ours am: 06b938bb2a -s ours
am skip reason: Merged-In Ie5ec5ebbf9b25dd6e83ec66aa0b0d869f484fd01 with SHA-1 a87770cca5 is already in history

Original change: https://android-review.googlesource.com/c/device/google/bluejay/+/2635392

Change-Id: I3f74fa9f33748ab931d8d960b27be77665453d36
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-27 08:06:07 +00:00
Xin Li
06b938bb2a [automerger skipped] Merge Android 13 QPR3 am: 57474b8846 -s ours am: b4a4abfd8a -s ours am: 1d7f12def0 -s ours am: 90c9ee57a9 -s ours am: b4178face8 -s ours
am skip reason: Merged-In Ie5ec5ebbf9b25dd6e83ec66aa0b0d869f484fd01 with SHA-1 a87770cca5 is already in history

Original change: https://android-review.googlesource.com/c/device/google/bluejay/+/2635392

Change-Id: I791cbaabbeb70cd83e53c1b006d23a3d10dbbc6b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-27 07:25:54 +00:00
Automerger Merge Worker
57920f3b12 Merge "Update bluejay SVN to 41 am: ac330e38bf am: 4dba405581" into udc-dev-plus-aosp am: f4918084ff am: 7edb7c4c09 am: 548275e1b8
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/23809847

Change-Id: I69c77ddb17a357a5a29b3255c998699c52b7dafb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-27 01:31:55 +00:00
Lokesh Kumar Goel
cdb5ff1755 Update bluejay SVN to 41 am: ac330e38bf am: 1f5e90806b am: 4704617092 am: f3a0ad9efc am: 3145522b04
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/23809847

Change-Id: I0f46b63ba5c22fb8b6aff88d0665ec0292df7619
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-27 01:19:22 +00:00
Lokesh Kumar Goel
b1dfefdaf3 Update bluejay SVN to 41 am: ac330e38bf am: 4dba405581 am: 179503379d am: df23737f06 am: ab6929e7d2
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/23809847

Change-Id: I29a826bf1a3b428f92632f77846a380397efee57
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-27 01:16:32 +00:00
Xin Li
b4178face8 [automerger skipped] Merge Android 13 QPR3 am: 57474b8846 -s ours am: b4a4abfd8a -s ours am: 1d7f12def0 -s ours am: 90c9ee57a9 -s ours
am skip reason: Merged-In Ie5ec5ebbf9b25dd6e83ec66aa0b0d869f484fd01 with SHA-1 a87770cca5 is already in history

Original change: https://android-review.googlesource.com/c/device/google/bluejay/+/2635392

Change-Id: Ibc774b171728a262550a02eaf747af607c20c21c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-27 01:14:16 +00:00
Lokesh Kumar Goel
82d5e4a29c Update bluejay SVN to 41 am: ac330e38bf am: 4dba405581 am: 179503379d am: b2164da058 am: c097232af6
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/23809847

Change-Id: Icbf7e43115af39dde21a4e386e7cfe3b62adac19
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-27 01:09:56 +00:00
Xin Li
90c9ee57a9 [automerger skipped] Merge Android 13 QPR3 am: 57474b8846 -s ours am: b4a4abfd8a -s ours am: 1d7f12def0 -s ours
am skip reason: Merged-In Ie5ec5ebbf9b25dd6e83ec66aa0b0d869f484fd01 with SHA-1 a87770cca5 is already in history

Original change: https://android-review.googlesource.com/c/device/google/bluejay/+/2635392

Change-Id: I1a9cb512da90ddd30ef975763b73c58d161e24ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-27 00:32:45 +00:00
Automerger Merge Worker
548275e1b8 Merge "Update bluejay SVN to 41 am: ac330e38bf am: 4dba405581" into udc-dev-plus-aosp am: f4918084ff am: 7edb7c4c09
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/23809847

Change-Id: I158a31ee12fc81900eb8e113180c8f52adb00bf8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-27 00:26:30 +00:00
Lokesh Kumar Goel
3145522b04 Update bluejay SVN to 41 am: ac330e38bf am: 1f5e90806b am: 4704617092 am: f3a0ad9efc
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/23809847

Change-Id: I7a96dc58eced792c77a0f5d422d43d8dce76011e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-27 00:25:19 +00:00
Lokesh Kumar Goel
ab6929e7d2 Update bluejay SVN to 41 am: ac330e38bf am: 4dba405581 am: 179503379d am: df23737f06
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/23809847

Change-Id: Icf348295f30b4e7f6234bc539a02dd54fc1a4fd4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-27 00:21:46 +00:00
Lokesh Kumar Goel
c097232af6 Update bluejay SVN to 41 am: ac330e38bf am: 4dba405581 am: 179503379d am: b2164da058
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/23809847

Change-Id: Idaf18bd7bcbaea95af069654e52c3d840d6eeb1d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-27 00:20:04 +00:00
Automerger Merge Worker
7edb7c4c09 Merge "Update bluejay SVN to 41 am: ac330e38bf am: 4dba405581" into udc-dev-plus-aosp am: f4918084ff
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/23809847

Change-Id: I94a68d08e61f9769bf363f8392804055f690465c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-26 23:57:42 +00:00
Lokesh Kumar Goel
f3a0ad9efc Update bluejay SVN to 41 am: ac330e38bf am: 1f5e90806b am: 4704617092
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/23809847

Change-Id: Ibd9c8ff9ebbae2080f72eb8e4ce3d59db85ecec1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-26 23:42:38 +00:00
Lokesh Kumar Goel
b2164da058 Update bluejay SVN to 41 am: ac330e38bf am: 4dba405581 am: 179503379d
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/23809847

Change-Id: Id4c902e470628284b89e0abf4b8c3ddc366048b2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-26 23:31:18 +00:00
Lokesh Kumar Goel
6d206fb4fd Update bluejay SVN to 41 am: ac330e38bf am: 4dba405581 am: 3e6016272a
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/23809847

Change-Id: I0327e06ec2fba265a6e552a45f0c63964d24713b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-26 23:27:58 +00:00
Lokesh Kumar Goel
df23737f06 Update bluejay SVN to 41 am: ac330e38bf am: 4dba405581 am: 179503379d
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/23809847

Change-Id: Id8d1bc9936d3cad6ee957e2946593730605256ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-26 23:27:24 +00:00
Lokesh Kumar Goel
73aa139c9e Update bluejay SVN to 41 am: ac330e38bf am: 4dba405581 am: 579c8d2e69
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/23809847

Change-Id: Id36f3fe82d3f48f6fc6b1493b833a4cae7133792
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-26 23:27:08 +00:00
Xin Li
1d7f12def0 [automerger skipped] Merge Android 13 QPR3 am: 57474b8846 -s ours am: b4a4abfd8a -s ours
am skip reason: Merged-In Ie5ec5ebbf9b25dd6e83ec66aa0b0d869f484fd01 with SHA-1 a87770cca5 is already in history

Original change: https://android-review.googlesource.com/c/device/google/bluejay/+/2635392

Change-Id: I8a7c335914e0aad8b10a3a238e7ba719fe3019fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-26 23:10:37 +00:00
Xin Li
b4a4abfd8a [automerger skipped] Merge Android 13 QPR3 am: 57474b8846 -s ours
am skip reason: Merged-In Ie5ec5ebbf9b25dd6e83ec66aa0b0d869f484fd01 with SHA-1 a87770cca5 is already in history

Original change: https://android-review.googlesource.com/c/device/google/bluejay/+/2635392

Change-Id: I7c78e791aa1b29ac80d8285a58ce06ddc09cc573
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-26 22:57:52 +00:00
Automerger Merge Worker
f4918084ff Merge "Update bluejay SVN to 41 am: ac330e38bf am: 4dba405581" into udc-dev-plus-aosp 2023-06-26 22:42:12 +00:00
Lokesh Kumar Goel
ee5875247e Update bluejay SVN to 41 am: ac330e38bf am: 4dba405581
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/23809847

Change-Id: Ie8865123089e53e6230c33c9d7606dc360f23b92
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-26 22:42:09 +00:00
Lokesh Kumar Goel
4704617092 Update bluejay SVN to 41 am: ac330e38bf am: 1f5e90806b
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/23809847

Change-Id: I694e1043c3890bc9a81fdcdfa0bf9821012c4993
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-26 22:42:07 +00:00
Lokesh Kumar Goel
3e6016272a Update bluejay SVN to 41 am: ac330e38bf am: 4dba405581
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/23809847

Change-Id: Ibf42f56b819a9737e025c34a5da3f4f6f5f86137
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-26 22:41:04 +00:00
Lokesh Kumar Goel
179503379d Update bluejay SVN to 41 am: ac330e38bf am: 4dba405581
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/23809847

Change-Id: I32c653edf966aa78067bfd823e6dba32f971123d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-26 22:41:01 +00:00
Lokesh Kumar Goel
579c8d2e69 Update bluejay SVN to 41 am: ac330e38bf am: 4dba405581
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/23809847

Change-Id: Ica1587a629ea5d173bae0c9549eec50529b83b25
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-26 22:40:52 +00:00
Lokesh Kumar Goel
1f5e90806b Update bluejay SVN to 41 am: ac330e38bf
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/23809847

Change-Id: I0d3558224da18aa6b0eda46b76635c7db7c964cc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-26 21:31:51 +00:00
Lokesh Kumar Goel
4dba405581 Update bluejay SVN to 41 am: ac330e38bf
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/23809847

Change-Id: Ic5cefe2cca6b33a4e067a8901946369823673f41
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-26 21:31:04 +00:00
Lokesh Kumar Goel
ac330e38bf Update bluejay SVN to 41
Bug: 285692955
Change-Id: Ia8f9db8eb23134db3eef2c7354da1f7ec3946f51
2023-06-26 01:19:54 +00:00
Xin Li
57474b8846 Merge Android 13 QPR3
Bug: 275386652
Merged-In: Ie5ec5ebbf9b25dd6e83ec66aa0b0d869f484fd01
Change-Id: Icf715d66021bec4741c86bf3793b2c5d9beaf254
2023-06-21 15:14:32 -07:00
TeYuan Wang
aaeea8dbdf powerhint: remove the duplicate thermal powerhint settings
For the current design, thermalHAL will only enable one hint base on the current severity and disable the previous one. As a result, the power hint of higher severity should maintain the actions from lower severity which cause the larger config size and maintenance effort.

The new thermalHAL design will keep the lower severity's hint enabled, so we could remove the duplicate policies from higher level.

Bug: 241737737
Test: verified b3 with emul_temp
Change-Id: Ife03b139ad80e1c98f9e6093ac02b8b4f3582656
2023-06-15 16:25:34 -07:00
paulsu
06e143f807 Remove UgBgGroupThrottle node to keep ug_bg_group_throttle 308 by default am: 1690c6ee26 am: cedfb7cb2e am: 14f342cb8d am: 818473b21d
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/23686047

Change-Id: I13864fdfb18a5474bfc008004d2f5becb2f791b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-14 11:03:58 +00:00
paulsu
d685573d7e Remove UgBgGroupThrottle node to keep ug_bg_group_throttle 308 by default am: 1690c6ee26 am: cedfb7cb2e am: adef461600 am: 10686eda85
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/23686047

Change-Id: I4624937ed1ff0e92fb17eb66d985791a3aaa8233
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-14 11:03:01 +00:00
paulsu
4f1b95c6a8 Remove UgBgGroupThrottle node to keep ug_bg_group_throttle 308 by default am: 1690c6ee26 am: 6875c3d2e2 am: 5ba5de6012 am: 37cec168c9
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/23686047

Change-Id: I07472473db038bd8d3c6facfd70eac38b3ca86b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-14 11:02:19 +00:00
paulsu
818473b21d Remove UgBgGroupThrottle node to keep ug_bg_group_throttle 308 by default am: 1690c6ee26 am: cedfb7cb2e am: 14f342cb8d
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/23686047

Change-Id: I8173e424fd6411274d703bd5e1338ea0aefbec94
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-14 10:38:43 +00:00
paulsu
10686eda85 Remove UgBgGroupThrottle node to keep ug_bg_group_throttle 308 by default am: 1690c6ee26 am: cedfb7cb2e am: adef461600
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/23686047

Change-Id: Idaee5f899960e09653d8cf4c27efa1d17bdc2b3a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-14 10:09:30 +00:00
paulsu
37cec168c9 Remove UgBgGroupThrottle node to keep ug_bg_group_throttle 308 by default am: 1690c6ee26 am: 6875c3d2e2 am: 5ba5de6012
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/23686047

Change-Id: I3f5bc80ba789fd502f16078f3522220f6cb865fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-14 10:09:00 +00:00
paulsu
14f342cb8d Remove UgBgGroupThrottle node to keep ug_bg_group_throttle 308 by default am: 1690c6ee26 am: cedfb7cb2e
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/23686047

Change-Id: I386ec2e04920628f33d4de49bc9118b4a2ddb97a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-14 09:50:48 +00:00
paulsu
26a5e05710 Remove UgBgGroupThrottle node to keep ug_bg_group_throttle 308 by default am: 1690c6ee26 am: 76d68f001c
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/23686047

Change-Id: I76414cf72eca15d4149a71f349aa880ab2383ec2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-14 09:46:30 +00:00
paulsu
adef461600 Remove UgBgGroupThrottle node to keep ug_bg_group_throttle 308 by default am: 1690c6ee26 am: cedfb7cb2e
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/23686047

Change-Id: I8898b0887de49af579a671273a6ed5f4ecd09b70
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-14 09:46:03 +00:00
paulsu
0843feaeb5 Remove UgBgGroupThrottle node to keep ug_bg_group_throttle 308 by default am: 1690c6ee26 am: 8d50f78189
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/23686047

Change-Id: I08fad72fd36b7101a3b47166cb00eb0e06b2687d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-14 09:46:02 +00:00