lineagehw: Check if files are readable when we read themlineage-15.1

Change-Id: Ife8900d57de47e3ce148dc362644b696a09ebc71

7 files changed, 10 insertions, 7 deletions

diff --git a/src/org/lineageos/hardware/AdaptiveBacklight.java b/src/org/lineageos/hardware/AdaptiveBacklight.java
index f9cc2bd..c3d027a 100644
--- a/src/org/lineageos/hardware/AdaptiveBacklight.java
+++ b/src/org/lineageos/hardware/AdaptiveBacklight.java
@@ -45,7 +45,7 @@ public class AdaptiveBacklight {
             return true;
         }
 
-        return FileUtils.isFileWritable(FILE_CABC);
+        return FileUtils.isFileReadable(FILE_CABC) && FileUtils.isFileWritable(FILE_CABC);
     }
 
     /**
diff --git a/src/org/lineageos/hardware/AutoContrast.java b/src/org/lineageos/hardware/AutoContrast.java
index e048a04..8638d5d 100644
--- a/src/org/lineageos/hardware/AutoContrast.java
+++ b/src/org/lineageos/hardware/AutoContrast.java
@@ -35,7 +35,7 @@ public class AutoContrast {
      * @return boolean Supported devices must return always true
      */
     public static boolean isSupported() {
-        return FileUtils.isFileWritable(FILE_ACO);
+        return FileUtils.isFileReadable(FILE_ACO) && FileUtils.isFileWritable(FILE_ACO);
     }
 
     /**
diff --git a/src/org/lineageos/hardware/ColorEnhancement.java b/src/org/lineageos/hardware/ColorEnhancement.java
index 144b208..ba603a5 100644
--- a/src/org/lineageos/hardware/ColorEnhancement.java
+++ b/src/org/lineageos/hardware/ColorEnhancement.java
@@ -35,7 +35,7 @@ public class ColorEnhancement {
      * @return boolean Supported devices must return always true
      */
     public static boolean isSupported() {
-        return FileUtils.isFileWritable(FILE_CE);
+        return FileUtils.isFileReadable(FILE_CE) && FileUtils.isFileWritable(FILE_CE);
     }
 
     /**
diff --git a/src/org/lineageos/hardware/DisplayColorCalibration.java b/src/org/lineageos/hardware/DisplayColorCalibration.java
index 796c0d4..3f3f6cd 100644
--- a/src/org/lineageos/hardware/DisplayColorCalibration.java
+++ b/src/org/lineageos/hardware/DisplayColorCalibration.java
@@ -59,7 +59,8 @@ public class DisplayColorCalibration {
         if (ActivityThread.currentApplication().getApplicationContext().getResources().getBoolean(
                     com.android.internal.R.bool.config_setColorTransformAccelerated)) {
             sMode = MODE_HWC2_COLOR_TRANSFORM;
-        } else if (FileUtils.isFileWritable(COLOR_FILE)) {
+        } else if (FileUtils.isFileReadable(COLOR_FILE) &&
+                FileUtils.isFileWritable(COLOR_FILE)) {
             sMode = MODE_SYSFS_RGB;
         } else {
             sMode = MODE_UNSUPPORTED;
diff --git a/src/org/lineageos/hardware/ReadingEnhancement.java b/src/org/lineageos/hardware/ReadingEnhancement.java
index 62addc7..8a48699 100644
--- a/src/org/lineageos/hardware/ReadingEnhancement.java
+++ b/src/org/lineageos/hardware/ReadingEnhancement.java
@@ -74,7 +74,8 @@ public class ReadingEnhancement {
         if (ActivityThread.currentApplication().getApplicationContext().getResources().getBoolean(
                     com.android.internal.R.bool.config_setColorTransformAccelerated)) {
             sMode = MODE_HWC2_COLOR_TRANSFORM;
-        } else if (FileUtils.isFileWritable(FILE_READING)) {
+        } else if (FileUtils.isFileReadable(FILE_READING) &&
+                FileUtils.isFileWritable(FILE_READING)) {
             sMode = MODE_SYSFS_READING;
         } else {
             sMode = MODE_UNSUPPORTED;
diff --git a/src/org/lineageos/hardware/SunlightEnhancement.java b/src/org/lineageos/hardware/SunlightEnhancement.java
index 4410f57..413deb9 100644
--- a/src/org/lineageos/hardware/SunlightEnhancement.java
+++ b/src/org/lineageos/hardware/SunlightEnhancement.java
@@ -64,7 +64,7 @@ public class SunlightEnhancement {
             return true;
         }
 
-        return FileUtils.isFileWritable(FACEMELT_PATH);
+        return FileUtils.isFileReadable(FACEMELT_PATH) && FileUtils.isFileWritable(FACEMELT_PATH);
     }
 
     /**
diff --git a/src/org/lineageos/hardware/VibratorHW.java b/src/org/lineageos/hardware/VibratorHW.java
index 7bff67f..7504d4a 100644
--- a/src/org/lineageos/hardware/VibratorHW.java
+++ b/src/org/lineageos/hardware/VibratorHW.java
@@ -30,7 +30,8 @@ public class VibratorHW {
     private static final String MIN_PATH = "/sys/class/timed_output/vibrator/vtg_min";
 
     public static boolean isSupported() {
-        return FileUtils.isFileWritable(LEVEL_PATH) &&
+        return FileUtils.isFileReadable(LEVEL_PATH) &&
+                FileUtils.isFileWritable(LEVEL_PATH) &&
                 FileUtils.isFileReadable(DEFAULT_PATH) &&
                 FileUtils.isFileReadable(MAX_PATH) &&
                 FileUtils.isFileReadable(MIN_PATH);