Kenny Root
26e02db5a0
[automerger skipped] Merge "zuma: conf: set gsa log group to system" into udc-d1-dev am: 1b60b821b5
am: 5ca17f0ec6
-s ours
...
am skip reason: Merged-In Ib8f299e99add9cc2f03887cda78f576924c522cd with SHA-1 76272091c8
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/23267881
Change-Id: Ib0b1a67d7b4ba454e4e180b8ac5b23c6d453efab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-22 06:10:46 +00:00
Kenny Root
1b5e286423
Merge "dumpstate: add GSA logs to bugreport" into udc-d1-dev am: 8d12593f03
am: 913fd439e5
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/23267885
Change-Id: Ie27b0ff55cc98930c6737073e0f84b361a7ab142
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-22 06:08:47 +00:00
Kenny Root
983845c2b0
Merge "zuma: conf: set gsa log group to system" into udc-d1-dev am: 1b60b821b5
am: 7ee8a90b6c
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/23267881
Change-Id: Id9c030dd2cc50c97c6cfe26d6314cfa4713a4e29
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-22 06:08:13 +00:00
Kenny Root
5ca17f0ec6
Merge "zuma: conf: set gsa log group to system" into udc-d1-dev am: 1b60b821b5
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/23267881
Change-Id: Ibf54eed31918be59ee43601fd90a0fe6d4703914
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-22 05:40:27 +00:00
Kenny Root
913fd439e5
Merge "dumpstate: add GSA logs to bugreport" into udc-d1-dev am: 8d12593f03
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/23267885
Change-Id: I28ecdd311258561a014e8c152e11fc6b9a58505e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-22 05:39:41 +00:00
Kenny Root
7ee8a90b6c
Merge "zuma: conf: set gsa log group to system" into udc-d1-dev am: 1b60b821b5
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/23267881
Change-Id: If45733155e6f94d4662c32ceac9e29a48ba0ff2f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-22 05:38:08 +00:00
Kenny Root
8d12593f03
Merge "dumpstate: add GSA logs to bugreport" into udc-d1-dev
2023-05-22 05:14:11 +00:00
Kenny Root
1b60b821b5
Merge "zuma: conf: set gsa log group to system" into udc-d1-dev
2023-05-22 05:14:03 +00:00
Prasanna Prapancham
f286eedf28
Merge "dumpstate: add ln8411 logbuffer into bugreport" into udc-d1-dev am: c9891733b2
am: 2e49a78f1a
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/23302724
Change-Id: I5e0f3d11fcffa66d57001abb59aa6f4150b3b9ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-19 03:18:54 +00:00
Prasanna Prapancham
280036a95c
Merge "dumpstate: add ln8411 logbuffer into bugreport" into udc-d1-dev am: c9891733b2
am: 85f58243b5
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/23302724
Change-Id: I30f7e13165a8327db1587eb15757936618b390c3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-19 03:16:59 +00:00
Prasanna Prapancham
2e49a78f1a
Merge "dumpstate: add ln8411 logbuffer into bugreport" into udc-d1-dev am: c9891733b2
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/23302724
Change-Id: I7957355c60c3d718cc151b0df1a1d2b801763834
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-19 02:31:40 +00:00
Prasanna Prapancham
85f58243b5
Merge "dumpstate: add ln8411 logbuffer into bugreport" into udc-d1-dev am: c9891733b2
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/23302724
Change-Id: Ie1f4a55fe481406eeecdd56de635480bba4d1e4f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-19 02:29:29 +00:00
Prasanna Prapancham
c9891733b2
Merge "dumpstate: add ln8411 logbuffer into bugreport" into udc-d1-dev
2023-05-19 01:33:58 +00:00
Szu-Wei (Wesley) Lee
a5f9ea7264
Merge "Add 4K 60 and 1080P 180 FPS performance points for BW AV1 encoder" into udc-d1-dev am: 29c406268a
am: 20638b2028
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/23321579
Change-Id: I5e22e4ba9be5dd30428fb83ba1764b073d514458
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-18 21:42:17 +00:00
Szu-Wei (Wesley) Lee
9141a96957
Merge "Add 4K 60 and 1080P 180 FPS performance points for BW AV1 encoder" into udc-d1-dev am: 29c406268a
am: be6e16196b
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/23321579
Change-Id: If9b19251df2c64ae2515a4118371a861fe3e974f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-18 21:41:38 +00:00
Szu-Wei (Wesley) Lee
20638b2028
Merge "Add 4K 60 and 1080P 180 FPS performance points for BW AV1 encoder" into udc-d1-dev am: 29c406268a
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/23321579
Change-Id: Ibb324f347489b0b0c2d93a1e644478ac116c1510
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-18 21:14:02 +00:00
Szu-Wei (Wesley) Lee
be6e16196b
Merge "Add 4K 60 and 1080P 180 FPS performance points for BW AV1 encoder" into udc-d1-dev am: 29c406268a
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/23321579
Change-Id: I4d7264ff6cdf8ec4d9ea6b7ab2597af3d4c8377c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-18 21:11:16 +00:00
Szu-Wei (Wesley) Lee
29c406268a
Merge "Add 4K 60 and 1080P 180 FPS performance points for BW AV1 encoder" into udc-d1-dev
2023-05-18 20:41:17 +00:00
Rick Yiu
35d12207d8
Modify utilization group setting am: 0cb6218a7e
am: 5fa8ccb352
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/23304981
Change-Id: I0b60b6e0cef1825acbf2959258de8b0b72052743
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-18 20:15:10 +00:00
Rick Yiu
8865178a12
Modify utilization group setting am: 0cb6218a7e
am: 013ba2c596
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/23304981
Change-Id: Ief9c775db0a2a8da40d5db9415919b47a125c675
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-18 20:05:01 +00:00
Rick Yiu
013ba2c596
Modify utilization group setting am: 0cb6218a7e
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/23304981
Change-Id: I3cc4500c6b3621fc40bb3d09d9f4929c568cc4ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-18 18:56:40 +00:00
Rick Yiu
5fa8ccb352
Modify utilization group setting am: 0cb6218a7e
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/23304981
Change-Id: I78281f21abad011158dc19d97e2aef7fabb64fe3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-18 18:54:13 +00:00
Szu-Wei (Wesley) Lee
e7587fb6d8
Add 4K 60 and 1080P 180 FPS performance points for BW AV1 encoder
...
Bug: 283280475
Change-Id: I61ef9ff79cf0e1afcb62b661ca8c41fa1f7ccb92
Signed-off-by: Szu-Wei (Wesley) Lee <szuweilee@google.com>
2023-05-18 18:24:12 +00:00
Rick Yiu
0cb6218a7e
Modify utilization group setting
...
We should set sysbg_ug to UG_BG but not sys_ug.
Bug: 282718756
Test: build pass
Change-Id: Ifa2dab78b0ea6c0d3e728b464f2f2139d7bf09aa
2023-05-18 10:13:17 +00:00
Treehugger Robot
77af440549
Merge "health: add suspend support for charger mode" into udc-d1-dev am: 795ca9ada2
am: 0b128ac62f
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/23285996
Change-Id: I94e1da583ebcbb7ea8435509b5bb1f4c3dc9ca46
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-18 05:38:19 +00:00
Carter Hsu
1f7da1a687
Merge "Revert "Revert "audio: set CCA to be enable by default""" into udc-d1-dev am: fd428e09f9
am: e249117599
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/23275588
Change-Id: I7bcc5545f4938e4617f6128b5436009369b2f505
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-18 05:37:05 +00:00
Treehugger Robot
4a9fdd8d5d
Merge "Lyric: Remove unused flag" into udc-d1-dev am: 11e0488628
am: 3fc0d9dfb9
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/23254218
Change-Id: Ie63d006e209a58592b51e8eb5fb406d5267a960f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-18 05:36:42 +00:00
Treehugger Robot
b064210c91
Merge "health: add suspend support for charger mode" into udc-d1-dev am: 795ca9ada2
am: c544c27ec3
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/23285996
Change-Id: I1ae59f9a683caa862004a1598368b4c62ef35007
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-18 05:35:03 +00:00
Carter Hsu
cffa88adcd
Merge "Revert "Revert "audio: set CCA to be enable by default""" into udc-d1-dev am: fd428e09f9
am: fb20583b50
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/23275588
Change-Id: I94d998cdcff25ce1a4ee4ccda3ad23d18bf81838
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-18 05:34:57 +00:00
Treehugger Robot
7e7f4459eb
Merge "Lyric: Remove unused flag" into udc-d1-dev am: 11e0488628
am: 9cdb2ba0ac
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/23254218
Change-Id: Ice3ee2fc957e65f8ab2c6f94613bf027363d9af6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-18 05:33:39 +00:00
Treehugger Robot
0b128ac62f
Merge "health: add suspend support for charger mode" into udc-d1-dev am: 795ca9ada2
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/23285996
Change-Id: I804c9431266fbf2f3d6ee0c42c879aad65e8e5cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-18 04:48:18 +00:00
Carter Hsu
e249117599
Merge "Revert "Revert "audio: set CCA to be enable by default""" into udc-d1-dev am: fd428e09f9
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/23275588
Change-Id: I646b25169d1b1eef0af2db345e2ad1c90dbcb6da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-18 04:47:46 +00:00
Treehugger Robot
3fc0d9dfb9
Merge "Lyric: Remove unused flag" into udc-d1-dev am: 11e0488628
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/23254218
Change-Id: Id6e822542d1f431b7eba738e1d0e1b7c5ec80a7c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-18 04:47:20 +00:00
Treehugger Robot
c544c27ec3
Merge "health: add suspend support for charger mode" into udc-d1-dev am: 795ca9ada2
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/23285996
Change-Id: I4f88f1af8b27132e925de20ed0c3ec8d1f4002a9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-18 04:46:34 +00:00
Carter Hsu
fb20583b50
Merge "Revert "Revert "audio: set CCA to be enable by default""" into udc-d1-dev am: fd428e09f9
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/23275588
Change-Id: I778e00dbfac2e6a1fcc27c5907d2268b12f07976
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-18 04:46:11 +00:00
Treehugger Robot
9cdb2ba0ac
Merge "Lyric: Remove unused flag" into udc-d1-dev am: 11e0488628
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/23254218
Change-Id: Ic89213a4f9ca2834e25d01de7c2047d3621e77dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-18 04:45:04 +00:00
Treehugger Robot
795ca9ada2
Merge "health: add suspend support for charger mode" into udc-d1-dev
2023-05-18 03:57:58 +00:00
Carter Hsu
fd428e09f9
Merge "Revert "Revert "audio: set CCA to be enable by default""" into udc-d1-dev
2023-05-18 03:54:41 +00:00
Treehugger Robot
11e0488628
Merge "Lyric: Remove unused flag" into udc-d1-dev
2023-05-18 03:53:53 +00:00
Badhri Jagan Sridharan
9460383982
Merge changes Ibe71bdd5,I6c3e7df0,Ie1a48b1a into udc-d1-dev am: 328f664f17
am: 8630f499c6
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/23255179
Change-Id: I298c854a4748d92284d6e7649f68766e97b7b9de
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-18 03:45:14 +00:00
Badhri Jagan Sridharan
1f0d7d3ac0
Merge changes Ibe71bdd5,I6c3e7df0,Ie1a48b1a into udc-d1-dev am: 328f664f17
am: d853f7c4dd
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/23255179
Change-Id: I1a195d8bef82c0049f7802292b4b034e18c442b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-18 01:55:26 +00:00
Jack Wu
2a3464431c
health: add suspend support for charger mode
...
Override ChargerEnableSuspend() function to true to support
suspend and resume in charger mode.
Bug: 282142607
Test: Confirm the device enter suspend in charger mode
Change-Id: I16f03da67a8830bf4130d67948601e0534d8aa27
Signed-off-by: Jack Wu <wjack@google.com>
2023-05-18 01:30:28 +00:00
Badhri Jagan Sridharan
8630f499c6
Merge changes Ibe71bdd5,I6c3e7df0,Ie1a48b1a into udc-d1-dev am: 328f664f17
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/23255179
Change-Id: I8702cf1cb1a6c715471a4150996ab841155461ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-18 01:10:48 +00:00
Badhri Jagan Sridharan
d853f7c4dd
Merge changes Ibe71bdd5,I6c3e7df0,Ie1a48b1a into udc-d1-dev am: 328f664f17
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/23255179
Change-Id: Iafc72bc88ef2aa9b054f59f9c873d30410c823d3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-18 01:04:55 +00:00
Badhri Jagan Sridharan
328f664f17
Merge changes Ibe71bdd5,I6c3e7df0,Ie1a48b1a into udc-d1-dev
...
* changes:
Usb: Populate UsbDataStatus only when not populated
Usb: Set connected status when connected to non compliant port partners
Usb non-compliant port partner implementation
2023-05-17 23:46:21 +00:00
Prasanna Prapancham
0c772833b3
dumpstate: add ln8411 logbuffer into bugreport
...
Test: flash local build and collect bugreport
Bug: 277799048
Change-Id: I4847e5e4da50bba6da94ad379e5c4dd5542cb6f6
Signed-off-by: Prasanna Prapancham <prapancham@google.com>
(cherry picked from commit 68738d356f
)
2023-05-17 22:50:47 +00:00
Kenny Root
3ba817ae3f
dumpstate: add GSA logs to bugreport
...
Add support for reading the GSA logs sysfs file to see the GSA logs in
the bugreports we get from dogfooders.
(cherry picked from commit 09cb4227bb
)
Bug: 271125313
Test: adb shell dumpstate
Change-Id: I09a2e039451b5eb8b7fa360ba03486bd871fb970
Merged-In: I09a2e039451b5eb8b7fa360ba03486bd871fb970
2023-05-17 17:35:32 +00:00
Treehugger Robot
878a53f36c
Merge "zuma: Use SkiaGL as RenderEngine backend" into udc-d1-dev am: 04dba77f21
am: 3604949427
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/23264975
Change-Id: I99dd41979fe618fe874169538481e14b8a078982
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-17 13:53:35 +00:00
Treehugger Robot
9c0baaa66b
Merge "zuma: Use SkiaGL as RenderEngine backend" into udc-d1-dev am: 04dba77f21
am: f4f177ef21
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/23264975
Change-Id: I084374e9d80c1b59a8298f18f1106fd939266b79
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-17 13:48:11 +00:00
Treehugger Robot
3604949427
Merge "zuma: Use SkiaGL as RenderEngine backend" into udc-d1-dev am: 04dba77f21
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/23264975
Change-Id: Ib57ffee121290184d9992f227cb8a71cc4364bfb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-17 12:48:22 +00:00