Do not use hidden Buid.IS_DEBUGGABLE reference. am: ac26bd59c0

Original change: https://android-review.googlesource.com/c/platform/packages/apps/SecureElement/+/2204016

Change-Id: I1a0be9530ed3e0e694fdbaeb93486665d34bea4b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

5 files changed, 6 insertions, 6 deletions

diff --git a/src/com/android/se/SecureElementService.java b/src/com/android/se/SecureElementService.java
index 92b3b51..6286228 100644
--- a/src/com/android/se/SecureElementService.java
+++ b/src/com/android/se/SecureElementService.java
@@ -68,7 +68,7 @@ public final class SecureElementService extends Service {
     public static final String VSTABLE_SECURE_ELEMENT_SERVICE =
             "android.se.omapi.ISecureElementService/default";
     private final String mTag = "SecureElementService";
-    private static final boolean DEBUG = Build.IS_DEBUGGABLE;
+    private static final boolean DEBUG = Build.isDebuggable();
     // LinkedHashMap will maintain the order of insertion
     private LinkedHashMap<String, Terminal> mTerminals = new LinkedHashMap<String, Terminal>();
     private int mActiveSimCount = 0;
diff --git a/src/com/android/se/Terminal.java b/src/com/android/se/Terminal.java
index d338cf8..a3a2b4e 100644
--- a/src/com/android/se/Terminal.java
+++ b/src/com/android/se/Terminal.java
@@ -75,7 +75,7 @@ public class Terminal {
     private Context mContext;
     private boolean mDefaultApplicationSelectedOnBasicChannel = true;
 
-    private static final boolean DEBUG = Build.IS_DEBUGGABLE;
+    private static final boolean DEBUG = Build.isDebuggable();
     private static final int GET_SERVICE_DELAY_MILLIS = 4 * 1000;
     private static final int EVENT_GET_HAL = 1;
 
diff --git a/src/com/android/se/security/AccessControlEnforcer.java b/src/com/android/se/security/AccessControlEnforcer.java
index e6f08cf..584e580 100644
--- a/src/com/android/se/security/AccessControlEnforcer.java
+++ b/src/com/android/se/security/AccessControlEnforcer.java
@@ -65,7 +65,7 @@ import java.util.NoSuchElementException;
 public class AccessControlEnforcer {
 
     private final String mTag = "SecureElement-AccessControlEnforcer";
-    private static final boolean DEBUG = Build.IS_DEBUGGABLE;
+    private static final boolean DEBUG = Build.isDebuggable();
     private PackageManager mPackageManager = null;
     private boolean mNoRuleFound = false;
     private AraController mAraController = null;
@@ -512,7 +512,7 @@ public class AccessControlEnforcer {
     }
 
     private void readSecurityProfile() {
-        if (!Build.IS_DEBUGGABLE) {
+        if (!Build.isDebuggable()) {
             mUseArf = true;
             mUseAra = true;
             mFullAccess = false; // Per default we don't grant full access.
diff --git a/src/com/android/se/security/AccessRuleCache.java b/src/com/android/se/security/AccessRuleCache.java
index 97c63bb..c1aa1ba 100644
--- a/src/com/android/se/security/AccessRuleCache.java
+++ b/src/com/android/se/security/AccessRuleCache.java
@@ -56,7 +56,7 @@ import java.util.Set;
 
 /** Stores all the access rules from the Secure Element */
 public class AccessRuleCache {
-    private static final boolean DEBUG = Build.IS_DEBUGGABLE;
+    private static final boolean DEBUG = Build.isDebuggable();
     private final String mTag = "SecureElement-AccessRuleCache";
     // Previous "RefreshTag"
     // 2012-09-25
diff --git a/src/com/android/se/security/HalRefDoParser.java b/src/com/android/se/security/HalRefDoParser.java
index 40ea7de..bc1e31d 100644
--- a/src/com/android/se/security/HalRefDoParser.java
+++ b/src/com/android/se/security/HalRefDoParser.java
@@ -41,7 +41,7 @@ import java.util.Map;
  */
 public class HalRefDoParser {
 
-    private static final boolean DEBUG = Build.IS_DEBUGGABLE;
+    private static final boolean DEBUG = Build.isDebuggable();
     private final String mTag = "SecureElement-HalRefDoParser";
 
     private static final String PROP_PRODUCT_HARDWARE_SKU = "ro.boot.product.hardware.sku";