Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)
Bug: 166295507
Merged-In: I3a1e355f510e6328d05e76ba2961562fe711da1b
Change-Id: I51411eabdf7f95382b4049a26f261b6d7af9aa86
diff --git a/init.hardware.xr.rc b/init.hardware.xr.rc
index 6b07458..ca00b49 100644
--- a/init.hardware.xr.rc
+++ b/init.hardware.xr.rc
@@ -21,11 +21,6 @@
import /vendor/etc/init/hw/init.${ro.hardware}.common.rc
on init
- # Temporarily stop booting into VR directly due to battery drain.
- # TODO(b/131327495): Re-enable this once VrHeadsetPowerPolicyService or its
- # equivalent lands in Android master.
- setprop ro.boot.vr 0
-
# Setup cpusets used by the VR services.
mkdir /dev/cpuset/kernel 0750 root system
write /dev/cpuset/kernel/cpus 0
diff --git a/sepolicy/vendor/location.te b/sepolicy/vendor/location.te
index aaf5a84..a31d242 100644
--- a/sepolicy/vendor/location.te
+++ b/sepolicy/vendor/location.te
@@ -27,7 +27,6 @@
allowxperm location self:udp_socket ioctl { SIOCGIFINDEX SIOCGIFHWADDR SIOCIWFIRSTPRIV_05 };
allow location self:socket create_socket_perms;
-# whitelist socket ioctl commands
allowxperm location self:socket ioctl msm_sock_ipc_ioctls;
# files in /sys
diff --git a/sepolicy/vendor/property_contexts b/sepolicy/vendor/property_contexts
index 36c44e5..65f340c 100644
--- a/sepolicy/vendor/property_contexts
+++ b/sepolicy/vendor/property_contexts
@@ -222,9 +222,6 @@
vendor.fps.init.succeed u:object_r:vendor_fingerprint_prop:s0
vendor.fps.init_retry.count u:object_r:vendor_fingerprint_prop:s0
-# vendor-init-settable
-ro.boot.vr u:object_r:exported2_system_prop:s0 exact bool
-
# wifi_sniffer
persist.vendor.wifi.sniffer.freq u:object_r:vendor_wifi_sniffer_prop:s0
persist.vendor.wifi.sniffer.bandwidth u:object_r:vendor_wifi_sniffer_prop:s0
diff --git a/usb/Usb.cpp b/usb/Usb.cpp
index 25a2df2..08e25e5 100644
--- a/usb/Usb.cpp
+++ b/usb/Usb.cpp
@@ -193,7 +193,7 @@
// There are no uevent signals which implies role swap timed out.
if (err == ETIMEDOUT) {
ALOGI("uevents wait timedout");
- // Sanity check.
+ // Partner check.
} else if (!usb->mPartnerUp) {
goto wait_again;
// Role switch succeeded since usb->mPartnerUp is true.
