From 5e5d43393c8ed762e9155b7089339c680e04d677 Mon Sep 17 00:00:00 2001 From: Michael Bestas Date: Mon, 13 Jun 2016 21:25:42 +0300 Subject: cmhw: Use cmsdk FileUtils Change-Id: Ie5728290a2d2106d40070162491a37313244f7b3 --- org/cyanogenmod/hardware/AdaptiveBacklight.java | 12 ++---------- org/cyanogenmod/hardware/AutoContrast.java | 12 ++---------- org/cyanogenmod/hardware/ColorEnhancement.java | 12 ++---------- org/cyanogenmod/hardware/SunlightEnhancement.java | 12 ++---------- org/cyanogenmod/hardware/UniqueDeviceId.java | 2 +- 5 files changed, 9 insertions(+), 41 deletions(-) diff --git a/org/cyanogenmod/hardware/AdaptiveBacklight.java b/org/cyanogenmod/hardware/AdaptiveBacklight.java index c147779..a878b7e 100644 --- a/org/cyanogenmod/hardware/AdaptiveBacklight.java +++ b/org/cyanogenmod/hardware/AdaptiveBacklight.java @@ -16,12 +16,10 @@ package org.cyanogenmod.hardware; -import org.cyanogenmod.hardware.util.FileUtils; +import org.cyanogenmod.internal.util.FileUtils; import android.util.Log; -import java.io.File; - /** * Adaptive backlight support (this refers to technologies like NVIDIA SmartDimmer, * QCOM CABL or Samsung CABC). @@ -45,13 +43,7 @@ public class AdaptiveBacklight { return true; } - final File f = new File(FILE_CABC); - - if(f.exists()) { - return true; - } else { - return false; - } + return FileUtils.isFileWritable(FILE_CABC); } /** diff --git a/org/cyanogenmod/hardware/AutoContrast.java b/org/cyanogenmod/hardware/AutoContrast.java index d7b2a3e..a1fe36f 100644 --- a/org/cyanogenmod/hardware/AutoContrast.java +++ b/org/cyanogenmod/hardware/AutoContrast.java @@ -16,12 +16,10 @@ package org.cyanogenmod.hardware; -import org.cyanogenmod.hardware.util.FileUtils; +import org.cyanogenmod.internal.util.FileUtils; import android.util.Log; -import java.io.File; - /** * Auto Contrast Optimization */ @@ -37,13 +35,7 @@ public class AutoContrast { * @return boolean Supported devices must return always true */ public static boolean isSupported() { - File f = new File(FILE_ACO); - - if(f.exists()) { - return true; - } else { - return false; - } + return FileUtils.isFileWritable(FILE_ACO); } /** diff --git a/org/cyanogenmod/hardware/ColorEnhancement.java b/org/cyanogenmod/hardware/ColorEnhancement.java index d34cad8..72ce579 100644 --- a/org/cyanogenmod/hardware/ColorEnhancement.java +++ b/org/cyanogenmod/hardware/ColorEnhancement.java @@ -16,12 +16,10 @@ package org.cyanogenmod.hardware; -import org.cyanogenmod.hardware.util.FileUtils; +import org.cyanogenmod.internal.util.FileUtils; import android.util.Log; -import java.io.File; - /** * Color enhancement support */ @@ -37,13 +35,7 @@ public class ColorEnhancement { * @return boolean Supported devices must return always true */ public static boolean isSupported() { - File f = new File(FILE_CE); - - if(f.exists()) { - return true; - } else { - return false; - } + return FileUtils.isFileWritable(FILE_CE); } /** diff --git a/org/cyanogenmod/hardware/SunlightEnhancement.java b/org/cyanogenmod/hardware/SunlightEnhancement.java index a3f44d2..36d1cb2 100644 --- a/org/cyanogenmod/hardware/SunlightEnhancement.java +++ b/org/cyanogenmod/hardware/SunlightEnhancement.java @@ -16,12 +16,10 @@ package org.cyanogenmod.hardware; -import org.cyanogenmod.hardware.util.FileUtils; +import org.cyanogenmod.internal.util.FileUtils; import android.util.Log; -import java.io.File; - /** * Facemelt mode! */ @@ -44,13 +42,7 @@ public class SunlightEnhancement { return true; } - File f = new File(FILE_SRE); - - if(f.exists()) { - return true; - } else { - return false; - } + return FileUtils.isFileWritable(FILE_SRE); } /** diff --git a/org/cyanogenmod/hardware/UniqueDeviceId.java b/org/cyanogenmod/hardware/UniqueDeviceId.java index d710e1b..47628a7 100644 --- a/org/cyanogenmod/hardware/UniqueDeviceId.java +++ b/org/cyanogenmod/hardware/UniqueDeviceId.java @@ -16,7 +16,7 @@ package org.cyanogenmod.hardware; -import org.cyanogenmod.hardware.util.FileUtils; +import org.cyanogenmod.internal.util.FileUtils; /** * Generate a unique but deterministic ID for this hardware, based on unchangeable -- cgit v1.2.3