Commit graph

5072 commits

Author SHA1 Message Date
Darren Hsu
3c8118e0f8 powerstats: change TPU DVFS data source from ACPM to TPU kernel
ACPM has an issue b/315079424 that reports incorrect TPU DVFS
residency. So change the data source from ACPM to TPU kernel.

Bug: 310094590
Test: vts-tradefed run vts -m VtsHalPowerStatsTargetTest
Change-Id: If4bdaeea510b1a8e72d057a7fbb0dc03f6a6c665
Signed-off-by: Darren Hsu <darrenhsu@google.com>
2023-12-12 23:20:13 +08:00
YK Hung
ed808b4425 Merge "Grant the post notification permission to Turbo" into main 2023-12-12 10:21:08 +00:00
Kuen-Han Tsai
c6c1954a28 Merge "usb: enable media-presence polling for SD cards" into main 2023-12-12 08:06:15 +00:00
Wesley Wang
838d9245c0 Grant the post notification permission to Turbo
Bug: 293813663
Test: manual and local build verify
Change-Id: I9ae27af828b1eeb2b8c2e2397a94e74f2315298a
2023-12-12 14:21:41 +08:00
Kuen-Han Tsai
559da7282a usb: enable media-presence polling for SD cards
After USB enumeration, some SD card readers do not send signals to the
device when the SD card is inserted or removed.

To support SD card hotplugging, this patch enables in-kernel
media-presence polling, which will check the SD card status every 2
seconds after a SD card reader is attached.

Bug: 186479576
Test: SD card insertion/removal and data copy (see b/301566595)
Change-Id: I044aeffd9386c0bee6138402e5130c39e1adbc9f
Signed-off-by: Kuen-Han Tsai <khtsai@google.com>
2023-12-12 14:11:31 +08:00
Hungyen Weng
8caeeb3811 config: Use carrier config in ROM by default am: 06e99301dd am: 6a0f8557ef
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/25616149

Change-Id: Ifb518f5fffe10ade5ffcd9df412a767feedaa53d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-12 05:46:05 +00:00
Hungyen Weng
6a0f8557ef config: Use carrier config in ROM by default am: 06e99301dd
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/25616149

Change-Id: I3eb4c0748edaee4a93e156eb6d9c8f2a40a60ae4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-12 05:12:00 +00:00
Xin Li
1b45f49762 [automerger skipped] Merge Android 14 QPR1 am: 3db3ce96a7 -s ours am: ca4d830813 -s ours am: ccb168aa86 -s ours
am skip reason: Merged-In I12add8918fb1922029cbbee130be33a3a36e44a4 with SHA-1 8dadca19cf is already in history

Original change: https://android-review.googlesource.com/c/device/google/zuma/+/2866342

Change-Id: I8535f81cadead59df772a39ca12c7e67c321b5bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-11 22:57:38 +00:00
RD Babiera
3082aa7f48 usb: report displayport capable port partner disconnect to drm
On port-partner remove, write to drm's usbc_cable_disconnect
node if setupDisplayPortPoll() had run previously in the
connection, flagged by mPartnerSupportsDisplayPort.

Test: manual test on device
Bug: 303820069
Change-Id: I3478f2f027540972647044716a1a3e832ae1b152
Signed-off-by: RD Babiera <rdbabiera@google.com>
2023-12-11 22:34:53 +00:00
Xin Li
ccb168aa86 [automerger skipped] Merge Android 14 QPR1 am: 3db3ce96a7 -s ours am: ca4d830813 -s ours
am skip reason: Merged-In I12add8918fb1922029cbbee130be33a3a36e44a4 with SHA-1 8dadca19cf is already in history

Original change: https://android-review.googlesource.com/c/device/google/zuma/+/2866342

Change-Id: Ib0634058959d578b4362dc2740c6532e55b39f6f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-11 22:02:25 +00:00
Xin Li
ca4d830813 [automerger skipped] Merge Android 14 QPR1 am: 3db3ce96a7 -s ours
am skip reason: Merged-In I12add8918fb1922029cbbee130be33a3a36e44a4 with SHA-1 8dadca19cf is already in history

Original change: https://android-review.googlesource.com/c/device/google/zuma/+/2866342

Change-Id: I7554252880002165eead6431b0b4ef12c2ee9756
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-11 21:16:35 +00:00
Hungyen Weng
06e99301dd config: Use carrier config in ROM by default
Bug: 314890118

Test: Flash ROM and confirm the carrier config follows the ROM.
Change-Id: Iffdb9a3a53e82d86d9917d84a7ce6ac49a3bad2a
2023-12-11 11:24:09 -08:00
Wilson Sung
259348f8f7 Update SELinux error
Test: SELinuxUncheckedDenialBootTest
Bug: 315720601
Test: scanBugreport
Bug: 315720874
Bug: 315104803
Test: scanAvcDeniedLogRightAfterReboot
Bug: 315104803
Change-Id: If15ba27fec6c876984823f8bb214bb7db59f7fd2
2023-12-11 02:54:00 +00:00
kierancyphus
da98405dec logmasklibrary: update version info and freeze api
The versions were originally not specified in the device manifest and
compatibility matrices. This is changed here to fix the broken vts
tests.

Bug: 310109332
Test: atest vts_treble_vintf_vendor_test -- --abi arm64-v8a
Change-Id: I58653ed6f284b091995c93e9bf44a65023f380db
2023-12-11 01:47:59 +00:00
Will McVicker
9f7b7c532d [automerger skipped] fstab: allow unlocked devices to boot with AVB test key am: b832cc86c7 -s ours am: d99ce52b7a -s ours am: bc07227536 -s ours
am skip reason: skipped by user willmcvicker

Original change: https://android-review.googlesource.com/c/device/google/zuma/+/2795415

Change-Id: I3b5dcd4e5723fa87ed648d772fa0879ae1d6ef1d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-09 08:59:22 +00:00
Will McVicker
bc07227536 [automerger skipped] fstab: allow unlocked devices to boot with AVB test key am: b832cc86c7 -s ours am: d99ce52b7a -s ours
am skip reason: skipped by user willmcvicker

Original change: https://android-review.googlesource.com/c/device/google/zuma/+/2795415

Change-Id: I2715ce19c1eec0768919fe8362ad4e6a85a77869
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-09 08:25:26 +00:00
Will McVicker
d99ce52b7a [automerger skipped] fstab: allow unlocked devices to boot with AVB test key am: b832cc86c7 -s ours
am skip reason: skipped by user willmcvicker

Original change: https://android-review.googlesource.com/c/device/google/zuma/+/2795415

Change-Id: I07980e0ed1770697e0ed10aeb35978a8136bb8a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-09 07:55:48 +00:00
Roy Luo
585d72a3bd Merge "Revert^2 "usb: introduce UsbDataSessionMonitor class"" into main 2023-12-09 00:22:06 +00:00
Xin Li
3db3ce96a7 Merge Android 14 QPR1
Merged-In: I12add8918fb1922029cbbee130be33a3a36e44a4
Bug: 315507370
Change-Id: I1327fae09a2fa96de643bce11ece9e98eaada3b2
2023-12-08 13:16:15 -08:00
Roy Luo
09f98e2ed6 Revert^2 "usb: introduce UsbDataSessionMonitor class"
3e5743c521

Bug: 297224564
Bug: 296119135
Change-Id: I4fc7da8c628292bb2c702c6fd3f059202e6ca82b
2023-12-08 20:15:27 +00:00
Xin Li
534bf242d1 [automerger skipped] Merge UQ1A.231205.015 am: 8dadca19cf -s ours am: 742a283039 -s ours
am skip reason: Merged-In Icc611e53d39734b7f6ce9c70ca601d61ec4d4e33 with SHA-1 707c8849e5 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/25591051

Change-Id: Ibc132157b4a2e53338a0fc4d5aacadbb3c64ac52
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-08 08:51:03 +00:00
Xin Li
742a283039 [automerger skipped] Merge UQ1A.231205.015 am: 8dadca19cf -s ours
am skip reason: Merged-In Icc611e53d39734b7f6ce9c70ca601d61ec4d4e33 with SHA-1 707c8849e5 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/25591051

Change-Id: I8ef810d771cf4155fd98d8352a2b09a18c6f3c8d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-08 08:21:16 +00:00
Xin Li
8dadca19cf Merge UQ1A.231205.015
Bug: 308969284
Merged-In: Icc611e53d39734b7f6ce9c70ca601d61ec4d4e33
Change-Id: I12add8918fb1922029cbbee130be33a3a36e44a4
2023-12-07 15:47:54 -08:00
Wilson Sung
2ecdf16781 Update SELinux error
Test: SELinuxUncheckedDenialBootTest
Bug: 315104235
Test: scanBugreport
Bug: 315104508
Bug: 315104235
Test: scanAvcDeniedLogRightAfterReboot
Bug: 315104941
Bug: 315104235
Change-Id: Icb01366f95e6ca4001246215e487d702131b6947
2023-12-06 10:44:09 +00:00
David Drysdale
7beccb101a Merge "Add Secretkeeper HAL" into main 2023-12-06 10:21:03 +00:00
Treehugger Robot
ec93b1bbd4 Merge "dump_power: add eusb_repeater path to dump registers" into main 2023-12-06 06:09:31 +00:00
Roy Luo
1dc0d70de4 Merge "Revert "usb: introduce UsbDataSessionMonitor class"" into main 2023-12-05 17:13:34 +00:00
David Drysdale
98448f5628 Add Secretkeeper HAL
Test: VtsAidlAuthGraphSessionTest
Bug: 306364873
Change-Id: I57de11a4c08476979e9283914a552a90254ee3fb
2023-12-05 10:39:26 +00:00
Qian-Hao Huang
3e5743c521 Revert "usb: introduce UsbDataSessionMonitor class"
Revert submission 25524752-usbDataSessionMonitor

Reason for revert: Test for gs101/gs201 boot blocking issue (b/314904288)

Reverted changes: /q/submissionid:25524752-usbDataSessionMonitor

Change-Id: I8265d57152460693fe668c2d9d188037dec6e692
2023-12-05 09:36:10 +00:00
Ray Chi
7e755bb143 Add eusb_repeater to vendor_usb_debugfs context
Bug: 305145476
Test: adb bugreport
Change-Id: I8fe6eebb43ed80de486d93882879512d0918acee
2023-12-05 16:38:16 +08:00
Ray Chi
d120b32a73 dump_power: add eusb_repeater path to dump registers
Bug: 305145476
Test: adb bugreport
Change-Id: I96611e7741380661c0277107e8b0763e79cb6c94
2023-12-05 16:36:52 +08:00
Jason Chiu
10343c4fbf zuma: include bootctrl_aidl.mk from gs-common
Bug: 265063384
Change-Id: Ia17b1506e1ea00b2df34b1ced6bea6d37d6a8a58
Signed-off-by: Jason Chiu <jasoncschiu@google.com>
2023-12-05 00:46:12 +08:00
Jason Chiu
e555c307b2 zuma: move bootctrl service declaration to gs-common
Bug: 265063384
Change-Id: Ibd98a40b397361146638381c5cfc1c3d2544b18f
Signed-off-by: Jason Chiu <jasoncschiu@google.com>
2023-12-05 00:46:08 +08:00
Jason Chiu
fb463a38fd zuma: move bootctrl hal to gs-common
Bug: 265063384
Change-Id: I25924866d2bad4dbe7c14484caa29bf527f85451
Signed-off-by: Jason Chiu <jasoncschiu@google.com>
2023-12-05 00:46:03 +08:00
Jason Chiu
47c545c8b0 zuma: move sepolicy related to bootctrl hal to gs-common
Bug: 265063384
Change-Id: Ic99547173f6eade30bce2d60051163336b27ca3b
Signed-off-by: Jason Chiu <jasoncschiu@google.com>
2023-12-05 00:45:55 +08:00
Wilson Sung
7e977d05b5 Merge "Update SELinux error" into main 2023-12-04 02:33:03 +00:00
Daniel Norman
5f8ba1c0d3 Removes duplicate hidraw_device type definition. am: f219d38925 am: f2e746b644
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma-sepolicy/+/25533485

Change-Id: Id71f76f518ee2dd74cb7dc4ce0cfc3253853fb1b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-02 01:52:12 +00:00
Daniel Norman
f2e746b644 Removes duplicate hidraw_device type definition. am: f219d38925
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma-sepolicy/+/25533485

Change-Id: Ie0b6287cb50284c1ae6fc6ab40f89506efb71887
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-02 01:02:35 +00:00
Daniel Norman
f219d38925 Removes duplicate hidraw_device type definition.
This type is now defined by the platform.

Bug: 303522222
Change-Id: Ic46a7327bb2dab89f424cde2682a40f2b28a04db
Test: ls -z /dev/hidraw0
(cherry picked from commit 8ff4604573)
2023-12-02 00:01:28 +00:00
Daniel Norman
979e64b5f2 [automerger skipped] Removes duplicate hidraw_device type definition. am: 2729e96ec8 -s ours
am skip reason: Merged-In Ic46a7327bb2dab89f424cde2682a40f2b28a04db with SHA-1 8ff4604573 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma-sepolicy/+/25531285

Change-Id: I1f0d61fa7d734e739070c1e23cda82d727d66944
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-01 23:27:20 +00:00
Daniel Norman
2729e96ec8 Removes duplicate hidraw_device type definition.
This type is now defined by the platform.

Bug: 303522222
Test: ls -z /dev/hidraw0
Change-Id: Ic46a7327bb2dab89f424cde2682a40f2b28a04db
Merged-In: Ic46a7327bb2dab89f424cde2682a40f2b28a04db
(cherry picked from commit 8ff4604573)
2023-12-01 19:24:56 +00:00
Roy Luo
62f3a1abc4 Merge "usb: introduce UsbDataSessionMonitor class" into main 2023-12-01 16:43:44 +00:00
Dario Freni
2584e99c58 Merge "Revert "zuma: move sepolicy related to bootctrl hal to gs-common"" into main 2023-12-01 13:00:07 +00:00
Dario Freni
24678b1d38 Merge changes from topic "revert-25477883-gs-common_bootctrl-aidl-APKJEMYEPE" into main
* changes:
  Revert "zuma: move bootctrl hal to gs-common"
  Revert "zuma: move bootctrl service declaration to gs-common"
  Revert "zuma: include bootctrl_aidl.mk from gs-common"
2023-12-01 13:00:07 +00:00
Sebastian Pickl
fbe923d20a Revert "zuma: move sepolicy related to bootctrl hal to gs-common"
Revert submission 25477883-gs-common_bootctrl-aidl

Reason for revert: breaking builds b/314240126

Bug: 314240126

Reverted changes: /q/submissionid:25477883-gs-common_bootctrl-aidl

Change-Id: I84dda0a7c98ed1d1f7958734761c9c1a0bd9d169
2023-12-01 11:30:45 +00:00
Sebastian Pickl
8676a0deff Revert "zuma: move bootctrl hal to gs-common"
Revert submission 25477883-gs-common_bootctrl-aidl

Reason for revert: breaking builds b/314240126

Bug: 314240126

Reverted changes: /q/submissionid:25477883-gs-common_bootctrl-aidl

Change-Id: If413155d4a2129c482ae98a128dc05b4aaba5374
2023-12-01 11:30:35 +00:00
Sebastian Pickl
ae2cacc6e2 Revert "zuma: move bootctrl service declaration to gs-common"
Revert submission 25477883-gs-common_bootctrl-aidl

Reason for revert: breaking builds b/314240126

Bug: 314240126

Reverted changes: /q/submissionid:25477883-gs-common_bootctrl-aidl

Change-Id: Ib0fb8d03bb4592cfb0c9f5427326193b3ae16da0
2023-12-01 11:30:35 +00:00
Sebastian Pickl
65439a058c Revert "zuma: include bootctrl_aidl.mk from gs-common"
Revert submission 25477883-gs-common_bootctrl-aidl

Reason for revert: breaking builds b/314240126

Bug: 314240126

Reverted changes: /q/submissionid:25477883-gs-common_bootctrl-aidl

Change-Id: I126138b048512fe6b2bbb2d8463152974e8f7c0a
2023-12-01 11:30:35 +00:00
Kieran Cyphus
8534e092af Merge "LogMaskLibrary: Add newlines and fix posix perms" into main 2023-12-01 07:24:52 +00:00
Treehugger Robot
421b5abf97 Merge "zuma: move sepolicy related to bootctrl hal to gs-common" into main 2023-12-01 03:57:28 +00:00