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
Treehugger Robot
2b39200fec
Merge changes from topic "gs-common_bootctrl-aidl" into main
...
* changes:
zuma: include bootctrl_aidl.mk from gs-common
zuma: move bootctrl service declaration to gs-common
zuma: move bootctrl hal to gs-common
2023-12-01 03:57:28 +00:00
Treehugger Robot
942564adee
Merge "Update default color temperature for night light" into main
2023-12-01 03:36:42 +00:00
Treehugger Robot
124e7aa639
Merge "Suppress avc error log on debugfs's usb folder." into main
2023-11-30 23:26:22 +00:00
Roy Luo
ea65ca11f6
usb: introduce UsbDataSessionMonitor class
...
Migrate the usb data session event functions to the class with the
following additional functionalities;
- Support detecting gadget soft pulldown (usually done during configfs
function switch) and report usb data session correctly.
- Support reporting usb data compliance warnings to the class USB
by providing getDataComplianceWarnings call.
- Use boot_clock instead of steady_clock to measure time correctly in
the case of system suspend.
UsbDataSessionMonitor is self-contained and can be migrated to pixel usb
library after feature maturation.
Bug: 297224564
Bug: 296119135
Test: usb data session upload in device and host mode
Change-Id: Iba001933e193935d64cf5fd0a1257d02a4274fb1
2023-11-30 21:43:04 +00:00
Luis Delgado De Mendoza
76972151b2
Merge "Add sepolicy entries for new BT channel" into main
2023-11-30 16:21:41 +00:00
Muralidhar Reddy Mule
e18209fef7
Merge "[LPA][Zuma] Add notification pregrant" into udc-qpr-dev am: 7a01eb40ef
am: 4dbb989e10
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/25269253
Change-Id: I27731b7980f389362287d2a32a2ff9e6dd37bb0c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-30 15:34:43 +00:00
Muralidhar Reddy Mule
4dbb989e10
Merge "[LPA][Zuma] Add notification pregrant" into udc-qpr-dev am: 7a01eb40ef
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/25269253
Change-Id: I7617597b84f82597b16a635159c15bd67ef3dfb4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-30 14:48:04 +00:00
Muralidhar Reddy Mule
7a01eb40ef
Merge "[LPA][Zuma] Add notification pregrant" into udc-qpr-dev
2023-11-30 14:05:26 +00:00
Peter Lin
dc330b5e88
Update default color temperature for night light
...
Bug: 302396607
Test: adb shell dumpsys color_display | grep "Color temp"
Change-Id: If106f81c0dd2bd81a48e156e1cc75dba4a885aca
2023-11-30 07:51:45 +00:00
Wilson Sung
14dda6e255
Update SELinux error
...
Test: SELinuxUncheckedDenialBootTest
Bug: 314054292
Test: scanBugreport
Bug: 313804706
Bug: 312894238
Change-Id: Ibf9517b585dcd8e06c62075d85dc55eb8ed7d18d
2023-11-30 07:14:04 +00:00
Khoa Hong
fb1c8b60bb
Suppress avc error log on debugfs's usb folder.
...
The XHCI driver in kernel will write debugging information to DebugFS on
some USB host operations (for example: plugging in a USB headphone). We
are not using those information right now.
Bug: 311088739
Test: No error when plugging a USB headphone in.
Change-Id: I3a8e2290e97967c02453eadff440d8bbeefa31b1
2023-11-30 14:50:52 +08:00
Treehugger Robot
73592fb6ac
Merge "Ueventd changes for new BT channel in zuma" into main
2023-11-30 00:32:17 +00:00
Treehugger Robot
d05c6ad1e6
Merge "Handle empty read from file." into main
2023-11-29 17:59:23 +00:00
Edgar Arriaga García
6a3349663d
Merge "Add webview pinning for zuma devices" into main
2023-11-27 18:05:05 +00:00
Jason Chiu
23feade4db
zuma: move sepolicy related to bootctrl hal to gs-common
...
Bug: 265063384
Change-Id: I230ca394c5d1b6e68dd8b4d51ea06568810eb4e0
Signed-off-by: Jason Chiu <jasoncschiu@google.com>
2023-11-27 17:45:29 +08:00
Jason Chiu
f16d3f60d2
zuma: include bootctrl_aidl.mk from gs-common
...
Bug: 265063384
Change-Id: I95cc9feca160004ee1d1c8fdf85da92b894d01d5
Signed-off-by: Jason Chiu <jasoncschiu@google.com>
2023-11-27 17:36:02 +08:00