Commit graph

1746 commits

Author SHA1 Message Date
Treehugger Robot
fee2a1d564 Merge "Add aosp_bluejay_hwasan" into main am: 20153b7051
Original change: https://android-review.googlesource.com/c/device/google/bluejay/+/2729338

Change-Id: I952166410ecde868795fc4a6b1686aefc3674b2e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-28 22:54:51 +00:00
Treehugger Robot
20153b7051 Merge "Add aosp_bluejay_hwasan" into main 2023-08-28 21:30:57 +00:00
Florian Mayer
59488616be Add aosp_bluejay_hwasan
Bug: 297918380
Change-Id: I906deed8db5f347263c4035d3b6235bd9960055a
2023-08-28 13:10:44 -07:00
Xin Li
2a93fae2a8 Merge Android U (ab/10368041)
Bug: 291102124
Merged-In: I59500ba819f0c36f130b26b86b9dfe4415fa1792
Change-Id: Iffe4bd4cdf12ea8795bee3d48d6018222d11360a
2023-08-14 15:32:41 -07:00
Bill Yi
93ee4357c7 [automerger skipped] Merge TQ3A.230705.001 to aosp-main - DO NOT MERGE am: fa9ca262c2 -s ours
am skip reason: Merged-In I7c78e791aa1b29ac80d8285a58ce06ddc09cc573 with SHA-1 b4a4abfd8a is already in history

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

Change-Id: Ib66f1a292d6b6ecd0ba89aee3bdb2f67c04c17af
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-12 14:10:26 +00:00
Bill Yi
fa9ca262c2 Merge TQ3A.230705.001 to aosp-main - DO NOT MERGE
Merged-In: I7c78e791aa1b29ac80d8285a58ce06ddc09cc573
Merged-In: I8a7c335914e0aad8b10a3a238e7ba719fe3019fe
Merged-In: I20686d1b36061692f9e0a458de945e60763e20e7
Change-Id: I96b80ae6f68143b7be094b18954dd2a98352c901
2023-07-11 15:27:13 -07: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
Xin Li
57474b8846 Merge Android 13 QPR3
Bug: 275386652
Merged-In: Ie5ec5ebbf9b25dd6e83ec66aa0b0d869f484fd01
Change-Id: Icf715d66021bec4741c86bf3793b2c5d9beaf254
2023-06-21 15:14:32 -07:00
paulsu
6875c3d2e2 Remove UgBgGroupThrottle node to keep ug_bg_group_throttle 308 by default am: 1690c6ee26
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/23686047

Change-Id: I59500ba819f0c36f130b26b86b9dfe4415fa1792
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-14 08:59:09 +00:00
paulsu
1690c6ee26 Remove UgBgGroupThrottle node to keep ug_bg_group_throttle 308 by default
Bug: 280258727
Test: Found regression in b/286002292, local test.
Change-Id: Ia1e738be922799f2f18493143bb9aa0c2b3fbfa3
Signed-off-by: paulsu <paulsu@google.com>
2023-06-14 05:24:40 +00:00
Wei Wang
825df4889b Merge "Create group throttle powerhint" into udc-dev am: cce8ae607d
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/23589288

Change-Id: Ibec93d395c02aaa35f752be014b65570d94d5a88
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-08 17:56:36 +00:00
Wei Wang
cce8ae607d Merge "Create group throttle powerhint" into udc-dev 2023-06-08 17:17:33 +00:00
paulsu
0b2a6b2738 Create group throttle powerhint
Test: Local test
Bug: 280258727
Change-Id: Ie6c49fb9c9cab266306987346051709ddd3ada04
Signed-off-by: paulsu <paulsu@google.com>
2023-06-08 10:28:41 +00:00
Lokesh Kumar Goel
84fb61db3e Update bluejay SVN to 40 am: 42bc615c70 am: 00ee637e08
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/23556080

Change-Id: Idbf62a305b5a7f4e58bf503ed468a88b621ebd91
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-05 06:38:33 +00:00
Lokesh Kumar Goel
c1dd85fc55 Update bluejay SVN to 39 am: 9ee30193ee am: cdcb80d32a
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/23556079

Change-Id: If9f1ead57690d456629a874e9c14ab9674735292
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-05 06:38:07 +00:00
Lokesh Kumar Goel
1c91aa4e5c Update bluejay SVN to 40 am: 42bc615c70 am: 0a11338e39
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/23556080

Change-Id: I3f91e02ed7dab0e4755247cb2ab3463b661e086a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-05 06:34:43 +00:00
Lokesh Kumar Goel
f29b592800 Update bluejay SVN to 39 am: 9ee30193ee am: 84516ad474
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/23556079

Change-Id: I1d9510adcc3ba547a6a1a961d2cb7a28f67d6c33
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-05 06:34:16 +00:00
Lokesh Kumar Goel
0a11338e39 Update bluejay SVN to 40 am: 42bc615c70
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/23556080

Change-Id: I47208065180fbce211c21d037651a2b0c3723a5b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-05 05:54:53 +00:00
Lokesh Kumar Goel
84516ad474 Update bluejay SVN to 39 am: 9ee30193ee
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/23556079

Change-Id: I110df4cc0da9a4ffb48452c91a30b97018b2e455
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-05 05:54:26 +00:00
Lokesh Kumar Goel
00ee637e08 Update bluejay SVN to 40 am: 42bc615c70
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/23556080

Change-Id: If51d4e2802a29cf5c479a515be7635f506d619cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-05 05:52:37 +00:00
Lokesh Kumar Goel
cdcb80d32a Update bluejay SVN to 39 am: 9ee30193ee
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/23556079

Change-Id: I569dfdd4783340e2ce474a2280cd4d669ad210bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-05 05:52:10 +00:00
Lokesh Kumar Goel
42bc615c70 Update bluejay SVN to 40
Bug: 285692955
Change-Id: I78cce2638a15b48add7176c4ae037b317336789f
2023-06-04 02:25:53 +00:00
Lokesh Kumar Goel
9ee30193ee Update bluejay SVN to 39
Bug: 285692955

Change-Id: I41b873f633343cde5bf8fd700cdf20a5e2b6cf77
2023-06-04 02:25:53 +00:00
Wei Wang
af0673cce0 Merge "Remove rt_uclamp_min and sf_uclamp_min" into udc-dev am: 4ed1d17af8
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/23519892

Change-Id: Ifddfc2b5791e55139d21e7cbb0324aa2466ef969
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-02 17:42:34 +00:00
Treehugger Robot
2f0ae15b10 Merge "dck: add SE capability property" into udc-dev am: 8494f16035
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/23501627

Change-Id: I65f92bc4aa08c2c935341c9e3abd79c4ce0fa780
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-02 17:41:49 +00:00
Wei Wang
4ed1d17af8 Merge "Remove rt_uclamp_min and sf_uclamp_min" into udc-dev 2023-06-02 16:33:37 +00:00
Treehugger Robot
8494f16035 Merge "dck: add SE capability property" into udc-dev 2023-06-02 16:27:04 +00:00
Jeffrey Carlyle
4143a2bea5 dck: add SE capability property
Bug: 285390995
Test: boot cheetah; check logs to see that SE property is used
Change-Id: I413b80530f585317ec272383c9027c7725c8ea77
Signed-off-by: Jeffrey Carlyle <jcarlyle@google.com>
2023-06-01 21:15:45 +00:00
Matt Buckley
9803eae60b Remove rt_uclamp_min and sf_uclamp_min
rt_uclamp_min and sf_uclamp_min have been made redundant in Pixel by
ADPF for sf, so we are just going to remove them outright rather than
worrying about overriding them later

Bug: 285248880
Test: manual
Change-Id: If0ea3e8031205d23698cea8c2aad4e7b541bee2a
2023-06-01 20:50:35 +00:00
Treehugger Robot
9aa772aae3 Merge changes from topic "CirrusRAM19_drv7.0.0_dsp4.0.1_k5.10_b3" into udc-dev am: 5954dded61
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/23259323

Change-Id: Ib2e91beb8fbaa7e122e2cd0f1bee4fb13afbb5e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-01 08:15:44 +00:00
Treehugger Robot
5954dded61 Merge changes from topic "CirrusRAM19_drv7.0.0_dsp4.0.1_k5.10_b3" into udc-dev
* changes:
  Revert "haptics: update hapitcs sink and slot setting"
  Update cs40l26 modprobe modules
2023-06-01 07:36:42 +00:00
Android Build Coastguard Worker
bf34e077bc Merge cherrypicks of ['googleplex-android-review.googlesource.com/23231044', 'googleplex-android-review.googlesource.com/23396010'] into tm-qpr3-release.
Change-Id: I6544305ee5683900820194a11c27015fc5e84cef
2023-05-27 17:13:58 +00:00
Lokesh Kumar Goel
e3036660c6 Update bluejay SVN to 37
Bug: 282371465
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:9602aa3f1915bc16517102aa34f76df4bb4575cc)
Merged-In: Ic0c0fd1c8daeda0825cc9e77c687104bdc49376f
Change-Id: Ic0c0fd1c8daeda0825cc9e77c687104bdc49376f
2023-05-27 17:10:44 +00:00
Steve Berbary
4dda64711a Update bluejay SVN to 36
Bug: 282371465
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:9c0fa9d875d889c9e8e058dce935021e62ca0f15)
Merged-In: I358a14b86c08d9d41e550804c2d02db0beaae8a6
Change-Id: I358a14b86c08d9d41e550804c2d02db0beaae8a6
2023-05-27 17:10:41 +00:00
Lokesh Kumar Goel
87b7d6acfa Update bluejay SVN to 38 am: 538ea9fede am: 4bc24faa5a
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/23452552

Change-Id: I4219bf53dd6f391ea8e2a7bad06e51ceab476cb7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-27 04:19:50 +00:00
Lokesh Kumar Goel
d792565ad1 Update bluejay SVN to 38 am: 538ea9fede am: cbec87c547
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/23452552

Change-Id: I71e6d2d82998c3d8b499bdf406dc5978ef8cbe59
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-27 04:19:27 +00:00
Lokesh Kumar Goel
cbec87c547 Update bluejay SVN to 38 am: 538ea9fede
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/23452552

Change-Id: If7da0f992208cbb3dd454fd302c20d312f7f7f57
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-27 03:34:31 +00:00
Lokesh Kumar Goel
4bc24faa5a Update bluejay SVN to 38 am: 538ea9fede
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/23452552

Change-Id: If254845f51e36e294bd720d52392f3f6d2c1f86c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-27 03:33:32 +00:00
Lokesh Kumar Goel
538ea9fede Update bluejay SVN to 38
Bug: 282371465
Change-Id: I2693b422c57aefcd39d48797ca155cadff17cb35
2023-05-26 19:20:30 +00:00
Android Build Coastguard Worker
8a4430b693 [coastguard skipped] Merge sparse cherrypicks from sparse-10121037-L10400000960889242 into tm-qpr3-release.
COASTGUARD_SKIP: Id3b651c99c4a5e33cd2b34e8152a8c6d2e5a22a8
COASTGUARD_SKIP: I358a14b86c08d9d41e550804c2d02db0beaae8a6

Change-Id: Ica2855dc28b6f471a662dcc5a5795e6f6c02e386
2023-05-25 01:05:20 +00:00
Android Build Coastguard Worker
06fa04d09a Merge cherrypicks of ['googleplex-android-review.googlesource.com/23231044'] into sparse-10121037-L10400000960889242.
SPARSE_CHANGE: I358a14b86c08d9d41e550804c2d02db0beaae8a6

Change-Id: Id3b651c99c4a5e33cd2b34e8152a8c6d2e5a22a8
2023-05-25 00:57:59 +00:00
Steve Berbary
ed9a678058 Update bluejay SVN to 36
Bug: 282371465
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:9c0fa9d875d889c9e8e058dce935021e62ca0f15)
Merged-In: I358a14b86c08d9d41e550804c2d02db0beaae8a6
Change-Id: I358a14b86c08d9d41e550804c2d02db0beaae8a6
2023-05-25 00:57:44 +00:00
Lokesh Kumar Goel
feea3ab411 Update bluejay SVN to 37 am: 9602aa3f19 am: 821fb303e2
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/23396010

Change-Id: I70e4bbd0f4741e5806fc1ae8be5567c9261f2c31
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-24 17:34:59 +00:00
Lokesh Kumar Goel
a9ab8fd249 Update bluejay SVN to 37 am: 9602aa3f19 am: 584e506b18
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/23396010

Change-Id: Ic2b81c668bb33ffb044cbde2e6c5f0e87cd10c57
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-24 17:30:50 +00:00
Lokesh Kumar Goel
584e506b18 Update bluejay SVN to 37 am: 9602aa3f19
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/23396010

Change-Id: I5ccc72e62aec45397ce6c16e58a7fb2ce01a831f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-24 16:51:36 +00:00
Lokesh Kumar Goel
821fb303e2 Update bluejay SVN to 37 am: 9602aa3f19
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/23396010

Change-Id: I5af6aff129c5376b2d5d0b44b3d37a8fbb7a752a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-24 16:49:12 +00:00
Lokesh Kumar Goel
9602aa3f19 Update bluejay SVN to 37
Bug: 282371465
Change-Id: Ic0c0fd1c8daeda0825cc9e77c687104bdc49376f
2023-05-23 20:32:07 +00:00
Android Build Coastguard Worker
a6ac4c75d5 [coastguard skipped] Merge sparse cherrypicks from sparse-10161073-L49900000960778179 into tm-qpr3-release.
COASTGUARD_SKIP: I95485752875abeec53c5d3fedfde82b3223b435d
COASTGUARD_SKIP: I358a14b86c08d9d41e550804c2d02db0beaae8a6

Change-Id: Ie02d1e1d0138dbcd2137a044ac917291da94a71a
2023-05-18 22:22:48 +00:00
Android Build Coastguard Worker
498c8ef5b9 Merge cherrypicks of ['googleplex-android-review.googlesource.com/23231044'] into sparse-10161073-L49900000960778179.
SPARSE_CHANGE: I358a14b86c08d9d41e550804c2d02db0beaae8a6

Change-Id: I95485752875abeec53c5d3fedfde82b3223b435d
2023-05-18 22:16:14 +00:00
Steve Berbary
45a399d922 Update bluejay SVN to 36
Bug: 282371465
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:9c0fa9d875d889c9e8e058dce935021e62ca0f15)
Merged-In: I358a14b86c08d9d41e550804c2d02db0beaae8a6
Change-Id: I358a14b86c08d9d41e550804c2d02db0beaae8a6
2023-05-18 22:13:21 +00:00