chenkris
357cc1f618
Revert "Build g7_trusty_next for “next” configuration"
...
This reverts commit 5011c28eab
.
Bug: 348542941
Test: build
Change-Id: I26464d764de6964bc66126ef152ffcf068b8ce1c
2024-06-24 11:24:36 +00:00
KRIS CHEN
fa4b16ffb9
Merge "Build g7_trusty_next for “next” configuration" into main
2024-06-21 07:16:54 +00:00
chenkris
5011c28eab
Build g7_trusty_next for “next” configuration
...
Bug: 348542941
Test: build
Change-Id: Ie4c8e606980580189d63fb4764428b6aacdefdaa
2024-06-21 04:20:17 +00:00
Xin Li
bd4a5548e4
[automerger skipped] Merge 24Q3 (ab/11976889) to aosp-main-future am: 9a3e9a4920
-s ours
...
am skip reason: Merged-In I5d5b2e74f46eb0ca6d1f21b29e22019d9b3f25fa with SHA-1 ef1a3cc698
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/device/google/shusky/+/27907051
Change-Id: I4f65d6ede57e539744f662bb392773765aa782d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-20 21:16:39 +00:00
Leonard Ian
11ae3557fe
Merge "conf: Enable access for braking time sysfs nodes" into main
2024-06-20 06:22:57 +00:00
Xin Li
9a3e9a4920
Merge 24Q3 (ab/11976889) to aosp-main-future
...
Bug: 347831320
Merged-In: I5d5b2e74f46eb0ca6d1f21b29e22019d9b3f25fa
Change-Id: I77cd63b1046b0ba2bf2fbe5922818d4a336d5d76
2024-06-18 14:13:24 -07:00
Xin Li
61a7d0104f
[automerger skipped] Merge Android 14 QPR3 to AOSP main am: 53138ecea9
-s ours am: d9600388b8
-s ours
...
am skip reason: Merged-In Id7135d0505aa936207c761f04fb60c1017c125a9 with SHA-1 54ca980874
is already in history
Original change: https://android-review.googlesource.com/c/device/google/shusky/+/3131977
Change-Id: I0c10cb3630f02e1591de8a4ad897dd9cd335c67e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-18 05:55:36 +00:00
Xin Li
d9600388b8
[automerger skipped] Merge Android 14 QPR3 to AOSP main am: 53138ecea9
-s ours
...
am skip reason: Merged-In Id7135d0505aa936207c761f04fb60c1017c125a9 with SHA-1 54ca980874
is already in history
Original change: https://android-review.googlesource.com/c/device/google/shusky/+/3131977
Change-Id: I6434ddcf5316b078233620068e2e79b53d67875a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-17 20:41:57 +00:00
Ankur Bakshi
d312a08688
Merge changes from topic "aug-set1" into main
...
* changes:
Update husky SVN to 32
Update husky SVN to 31
Update husky SVN to 30
Update husky SVN to 29
Update husky SVN to 28
2024-06-17 05:04:31 +00:00
Ankur Bakshi
18814575aa
Merge changes from topic "aug-set1" into main
...
* changes:
Update shiba SVN to 32
Update shiba SVN to 31
Update shiba SVN to 30
Update shiba SVN to 29
Update shiba SVN to 28
2024-06-17 05:04:31 +00:00
vincenttew
ef1a3cc698
audio: add sound dose offset curve
...
Bug: 313395588
Test: boot to home, HIDL/AIDL w/wo xml configuration
Change-Id: I5d5b2e74f46eb0ca6d1f21b29e22019d9b3f25fa
Signed-off-by: vincenttew <vincenttew@google.com>
2024-06-14 02:38:15 +00:00
Xin Li
53138ecea9
Merge Android 14 QPR3 to AOSP main
...
Bug: 346855327
Merged-In: Id7135d0505aa936207c761f04fb60c1017c125a9
Change-Id: I992ba4f367fc9ee45b851fdf080867e6b1e8c93a
2024-06-13 10:48:56 -07:00
Ali K. Zadeh
8dece44546
Merge "Increase PMU_MID_SPC_THRESHOLD to 23 for 60fps" into main
2024-06-12 23:27:18 +00:00
Peter (YM)
071e4e0598
Merge "thermal: Move TPU to the VSKIN-SOC PID loop" into main
2024-06-12 03:06:40 +00:00
Joe Onorato
d81c86e9a4
Remove entries for unlunchable targets
...
Bug: 346406752
Test: Treehugger
Change-Id: I1f2f9690e5c70799acb8e15b382c7bc1ae7282d5
2024-06-10 15:10:46 -07:00
Ali K. Zadeh
bcafadef9c
Increase PMU_MID_SPC_THRESHOLD to 23 for 60fps
...
Test results show that increasing Spc threshold for mid core to 23 can
help with framedrop rate without affecting the power.
Bug: 317052150
Test: https://docs.google.com/spreadsheets/d/1bpSfVptz8nolSPfeYfkbjnP9pIK3l-U1JyqPNCwOwLc/edit?resourcekey=0-oiFKaxI6PtSGR6yXed327w&gid=430808958#gid=430808958
Change-Id: I9d5efbc0b7465825b36bff0dc70671121198b8c3
2024-06-07 16:20:50 +00:00
Xin Li
51f4af0fdc
[automerger skipped] Merge 2024-06 Release (ab/AP2A.240605.024) to aosp-main-future am: 54ca980874
-s ours
...
am skip reason: Merged-In Ib0b3823368c5124fc6dfce1452f51aee5bf66ba5 with SHA-1 18a613fe00
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/device/google/shusky/+/27555656
Change-Id: I0ea2434c2213482d153b2354758f933ddd2dd304
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-06 21:36:11 +00:00
Steven Moreland
a64dfb0e1d
Merge "Verify shusky prebuilts are 16 KB compatible." into main
2024-06-06 18:20:02 +00:00
Rick Yiu
a7f8dd6047
Merge "Revert "Set big core to group_cfs_skip_mask for sys group"" into main
2024-06-06 06:50:27 +00:00
Rick Yiu
be6417f824
Merge "Revert "Set big core to cpu skip mask by default"" into main
2024-06-06 06:50:16 +00:00
Rick Yiu
5d7958215d
Revert "Set big core to cpu skip mask by default"
...
This reverts commit c6609a4bb9
.
Reason for revert: 24Q3 kernel prebuilt not ready
Bug: 248621289
Change-Id: I53abd0932443fa437a487255b74e06dad18f7b9f
Test: build pass
2024-06-06 03:02:13 +00:00
Rick Yiu
d6c3e07eb4
Revert "Set big core to group_cfs_skip_mask for sys group"
...
This reverts commit 83bdd31a60
.
Reason for revert: 2dQ3 kernel prebuilt not ready
Bug: 248621289
Change-Id: I34c8616bc6b39e178c665a77c266c2a60438a651
Test: build pass
2024-06-06 03:01:52 +00:00
Xin Li
54ca980874
Merge 2024-06 Release (ab/AP2A.240605.024) to aosp-main-future
...
Bug: 343100748
Merged-In: Ib0b3823368c5124fc6dfce1452f51aee5bf66ba5
Change-Id: Id7135d0505aa936207c761f04fb60c1017c125a9
2024-06-05 14:12:12 -07:00
Ankur Bakshi
fe6c3b8adf
Update husky SVN to 32
...
Bug: 342381152
Change-Id: Icb9de546d095ed4d97e52cc32c1b034856ccd6fb
2024-06-05 20:19:42 +00:00
Ankur Bakshi
810570db66
Update husky SVN to 31
...
Bug: 342381152
Change-Id: I2bdfbbed0dff3c3c093dd46200f2d8ce15c28652
2024-06-05 20:17:55 +00:00
Ankur Bakshi
a7b24379b5
Update husky SVN to 30
...
Bug: 342381152
Change-Id: Icdbc5cd31dbca584589f703c16aa18698f7de294
2024-06-05 20:16:07 +00:00
Ankur Bakshi
d3e5bfd7a4
Update shiba SVN to 32
...
Bug: 342381152
Change-Id: I18527bb9a4358c14b2e99646670f0ab2da8173f0
2024-06-05 20:14:27 +00:00
Ankur Bakshi
98ed4cdd4e
Update shiba SVN to 31
...
Bug: 342381152
Change-Id: I2f0f9681455968cdaed4a74d3a77c0b2de1ba14b
2024-06-05 20:12:25 +00:00
Ankur Bakshi
b085ae1f72
Update shiba SVN to 30
...
Bug: 342381152
Change-Id: I2ef29057958ba6e31c76973de70d69577c1befe5
2024-06-05 20:09:25 +00:00
Ankur Bakshi
755f1354b7
Merge "Update shiba SVN to 27" into main
2024-06-05 19:23:16 +00:00
Peter (YM)
d3b792b4eb
thermal: Move TPU to the VSKIN-SOC PID loop
...
Bug: 345115917
Test: run TPU test
Change-Id: I372473dcedc35ea82ccc739f0ac185a8a83dfa53
Signed-off-by: Peter (YM) <peterym@google.com>
2024-06-05 07:24:55 +00:00
Rick Yiu
12274aa885
Merge "Set big core to cpu skip mask by default" into main
2024-06-05 01:15:22 +00:00
Steven Moreland
2b195c3b0d
Verify shusky prebuilts are 16 KB compatible.
...
Bug: 342466032
Test: build only
Change-Id: I7025cd2a02904c9bb974112f0f70368325b89d7f
2024-06-05 00:07:37 +00:00
Wei Wang
8c35d8a05c
Merge "Set big core to group_cfs_skip_mask for sys group" into main
2024-06-04 16:06:57 +00:00
Rick Yiu
c6609a4bb9
Set big core to cpu skip mask by default
...
Also reset the mask for launch and other camera streaming modes that
do not use it.
Bug: 248621289
Test: build pass
Change-Id: Id2f8f203359d4551d17f9b6ba02ee1c8e805fa3c
2024-06-04 14:00:14 +00:00
Ankur Bakshi
d650a1559a
Update shiba SVN to 29
...
Bug: 342381152
Change-Id: Ie294dbfad34544b20386d019edf8d24819aa1f6d
2024-05-31 18:22:52 +00:00
Ankur Bakshi
a7d44dbb50
Update husky SVN to 29
...
Bug: 342381152
Change-Id: I984a575909fd74ba78148bf39b5a109ecbf7bc3f
2024-05-31 18:21:25 +00:00
Ankur Bakshi
1fd7be6ff6
Update husky SVN to 28
...
Bug: 342381152
Change-Id: Iebe683d60093eecbf7aa8fb417c390e5180abfc9
2024-05-30 00:10:08 +00:00
Ankur Bakshi
dbbeb5592d
Update shiba SVN to 28
...
Bug: 342381152
Change-Id: Ib715c678925f017ef61b90b5331a705745ccd7ef
2024-05-30 00:07:58 +00:00
Cyan_Hsieh
6a90c104cd
Switch makefile owners to MK_OWNERS am: f9d1717851
am: 6adc787300
...
Original change: https://android-review.googlesource.com/c/device/google/shusky/+/3107250
Change-Id: I08b7e0cd3c54670576fb95ca574f3a3e1b68aa20
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-29 22:00:00 +00:00
Xin Li
818ad7c14b
Merge changes from topic "am-36173d5d8d894981aebd5978e1093e94" into main
...
* changes:
[automerger skipped] Merge "Merge Android 24Q2 Release (ab/11526283) to aosp-main-future" into aosp-main-future am: a547255f56
-s ours
[automerger skipped] Merge Android 24Q2 Release (ab/11526283) to aosp-main-future am: cd35c7dfcf
-s ours
2024-05-29 21:40:02 +00:00
Xin Li
566d1afb35
[automerger skipped] Merge "Merge Android 24Q2 Release (ab/11526283) to aosp-main-future" into aosp-main-future am: a547255f56
-s ours
...
am skip reason: Merged-In I67dc687f1751a17b6ff1431697a380b82d53c799 with SHA-1 bd5841248b
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/device/google/shusky/+/27273752
Change-Id: If2dc42fb65cbca87a31271ba35a49931d5bcf43b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-29 20:52:43 +00:00
Xin Li
8919d1e65a
[automerger skipped] Merge Android 24Q2 Release (ab/11526283) to aosp-main-future am: cd35c7dfcf
-s ours
...
am skip reason: Merged-In I67dc687f1751a17b6ff1431697a380b82d53c799 with SHA-1 bd5841248b
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/device/google/shusky/+/27273752
Change-Id: I738b5c1262cc1b202eb344cb1661a9df1a2f413f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-29 20:49:02 +00:00
Xin Li
37c3f9e9ed
[automerger skipped] Merge "Merge Android 24Q2 Release (ab/11526283) to aosp-main-future" into aosp-main-future am: a547255f56
-s ours
...
am skip reason: Merged-In I67dc687f1751a17b6ff1431697a380b82d53c799 with SHA-1 bd5841248b
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/device/google/shusky/+/27273752
Change-Id: I4623b3d9e1bc0a9830818a0e0df54f08c4b72e50
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-29 19:49:08 +00:00
Xin Li
ae97470105
[automerger skipped] Merge Android 24Q2 Release (ab/11526283) to aosp-main-future am: cd35c7dfcf
-s ours
...
am skip reason: Merged-In I67dc687f1751a17b6ff1431697a380b82d53c799 with SHA-1 bd5841248b
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/device/google/shusky/+/27273752
Change-Id: I9fbd95fb7e20229de0f556aff42f5870dfe3531f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-29 19:44:43 +00:00
Cyan_Hsieh
6adc787300
Switch makefile owners to MK_OWNERS am: f9d1717851
...
Original change: https://android-review.googlesource.com/c/device/google/shusky/+/3107250
Change-Id: I7c5462d4232579733a1d707782c2dcf429c4159b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-29 14:29:14 +00:00
Cyan_Hsieh
f9d1717851
Switch makefile owners to MK_OWNERS
...
Bug: 278167548
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:aa3eb14d33c1b5f93fb7f496eb625f3829d1325d )
Merged-In: I58886a7c812960f7ef7d14a4d9c0b0ccabd4b8ef
Change-Id: I58886a7c812960f7ef7d14a4d9c0b0ccabd4b8ef
2024-05-29 10:00:43 +00:00
Xin Li
a547255f56
Merge "Merge Android 24Q2 Release (ab/11526283) to aosp-main-future" into aosp-main-future
2024-05-24 21:16:08 +00:00
Vilas Bhat
3769d377bd
16k: shusky: Remove developer option from AOSP pgagnostic targets am: c7b8d16d38
am: 55b37a6818
...
Original change: https://android-review.googlesource.com/c/device/google/shusky/+/3102537
Change-Id: Ie421e448f5bff32cf21fb5301d648582c691d3d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-24 20:55:30 +00:00
Vilas Bhat
55b37a6818
16k: shusky: Remove developer option from AOSP pgagnostic targets am: c7b8d16d38
...
Original change: https://android-review.googlesource.com/c/device/google/shusky/+/3102537
Change-Id: I7809828518ba83afa7cc668f2a3eb46c6d7dd966
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-24 20:38:25 +00:00