commit 0837b4d9161b7cbab5b6dc9adbf6b4c9a3b6e2f5
author Alisher Alikhodjaev <alisher@google.com> Mon Sep 05 22:06:05 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Sep 05 22:06:05 2022 +0000
tree 11e25689d11755772241cdb1db77ac55cbe8f524
parent 8a3c982932c4feb642140d64778764cf04cafec6
parent 6c68f633931a03584735ab51e90188d0c59b765a

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

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

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

src/com/android/se/SecureElementService.java

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 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;

src/com/android/se/Terminal.java

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 @@
     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;
 

src/com/android/se/security/AccessControlEnforcer.java

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 @@
 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 @@
     }
 
     private void readSecurityProfile() {
-        if (!Build.IS_DEBUGGABLE) {
+        if (!Build.isDebuggable()) {
             mUseArf = true;
             mUseAra = true;
             mFullAccess = false; // Per default we don't grant full access.

src/com/android/se/security/AccessRuleCache.java

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 @@
 
 /** 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

src/com/android/se/security/HalRefDoParser.java

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 @@
  */
 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";