diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2017-08-07 22:16:22 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-08-07 22:16:22 +0000 |
| commit | 16be8f095853d6ce0eb1d452bc285d04f2872a9c (patch) | |
| tree | d63f2580bd901ff4aa0ce544cb0cd03c76b48f96 | |
| parent | a29b03b81b4e736dc0d429504ea29bc0afac07eb (diff) | |
| parent | bbef3fd93a98957ff43a996d616f125f4c38f685 (diff) | |
| download | device_google_wahoo-16be8f095853d6ce0eb1d452bc285d04f2872a9c.tar.gz device_google_wahoo-16be8f095853d6ce0eb1d452bc285d04f2872a9c.tar.bz2 device_google_wahoo-16be8f095853d6ce0eb1d452bc285d04f2872a9c.zip | |
Merge "sepolicy: move ftm4 sepolicy" into oc-dr1-dev
| -rw-r--r-- | sepolicy/vendor/genfs_contexts | 1 | ||||
| -rw-r--r-- | vr/VrDevice.cpp | 4 |
2 files changed, 2 insertions, 3 deletions
diff --git a/sepolicy/vendor/genfs_contexts b/sepolicy/vendor/genfs_contexts index 6a11f611..602c270d 100644 --- a/sepolicy/vendor/genfs_contexts +++ b/sepolicy/vendor/genfs_contexts @@ -10,7 +10,6 @@ genfscon sysfs /class/devfreq u:object_r:sysfs_msm_subsy genfscon sysfs /devices/soc/soc:qcom,memlat-cpu0 u:object_r:sysfs_msm_subsys:s0 genfscon sysfs /devices/soc/soc:qcom,memlat-cpu4 u:object_r:sysfs_msm_subsys:s0 genfscon sysfs /android_touch u:object_r:sysfs_touch:s0 -genfscon sysfs /devices/virtual/input/ftm4_touch u:object_r:sysfs_touch:s0 genfscon sysfs /devices/soc/1da4000.ufshc/host0/target0:0:0/0:0:0:0 u:object_r:sysfs_scsi_devices_0000:s0 diff --git a/vr/VrDevice.cpp b/vr/VrDevice.cpp index d33398f9..c9966abf 100644 --- a/vr/VrDevice.cpp +++ b/vr/VrDevice.cpp @@ -48,8 +48,8 @@ Return<void> VrDevice::setVrMode(bool enabled) { if (!android::base::SetProperty("ctl.restart", "thermal-engine")) { LOG(ERROR) << "Couldn't set thermal_engine restart property"; } - if (!access("/sys/class/input/ftm4_touch", R_OK)) { - FILE *f = fopen("/sys/class/input/ftm4_touch/vrmode", "w"); + if (!access("/sys/devices/virtual/input/ftm4_touch/vrmode", W_OK)) { + FILE *f = fopen("/sys/devices/virtual/input/ftm4_touch/vrmode", "w"); if (f) { fprintf(f, "%d", (enabled ? 1 : 0)); fclose(f); |