diff options
| author | Ali B <abittin@gmail.com> | 2021-06-10 14:00:24 +0200 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@box1> | 2021-06-10 14:00:24 +0200 |
| commit | 4228fcdcbf7948af11c3a380a93699e66bc3cb4d (patch) | |
| tree | 662a954c1ed12fa0781f8d31c30c41e66ae00a83 | |
| parent | 80b5c44893084f0c3b556be2efc281545288fa3a (diff) | |
| parent | 41bc8105929c2f6d7e47424a9e587c9bca3f6a6d (diff) | |
Merge "PartsBin: Utils: add empty check" into r11.1
| -rw-r--r-- | src/com/aicp/device/Utils.java | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/com/aicp/device/Utils.java b/src/com/aicp/device/Utils.java index 6b1edd8..1825a93 100644 --- a/src/com/aicp/device/Utils.java +++ b/src/com/aicp/device/Utils.java @@ -30,7 +30,7 @@ import android.util.Log; public class Utils { private static final boolean DEBUG = false; - private static final String TAG = "Utils"; + private static final String TAG = "PBUtils"; /** * Write a string value to the specified file. @@ -202,8 +202,9 @@ public class Utils { */ public static boolean getFileValueAsBoolean(String filename, boolean defValue) { String fileValue = readLine(filename); - if(fileValue!=null){ - return (fileValue.equals("0")?false:true); + if (DEBUG) Log.d(TAG, "getFileValueAsBoolean: " + fileValue + " :" + !"0".equals(fileValue)); + if (fileValue != null && !fileValue.isEmpty()){ + return ("0".equals(fileValue) ? false : true); } return defValue; } @@ -215,7 +216,7 @@ public class Utils { */ public static String getFileValue(String filename, String defValue) { String fileValue = readLine(filename); - if(fileValue!=null){ + if(fileValue != null && !fileValue.isEmpty()){ return fileValue; } return defValue; |