commit fd988e0c6a2ad2d8e462b54f6cbd43cc76d84b1b
author Linux Build Service Account <lnxbuild@localhost> Wed Mar 17 02:23:45 2021 -0700
committer Linux Build Service Account <lnxbuild@localhost> Wed Mar 17 02:23:45 2021 -0700
tree 3993d05340556682dad2a49ab4126882f2d8ed3b
parent 1f4e4913ddc16a253b992d2e0f7e18f048483fba
parent 14547e802ee7ac7eff571db501b59fc0b3bef1af

Merge 14547e802ee7ac7eff571db501b59fc0b3bef1af on remote branch

Change-Id: I1586f6181e748137cfec91e0b1e5fbc26be12212

src/com/android/se/SecureElementService.java

diff --git a/src/com/android/se/SecureElementService.java b/src/com/android/se/SecureElementService.java
index 4e6a232..807fecc 100644
--- a/src/com/android/se/SecureElementService.java
+++ b/src/com/android/se/SecureElementService.java
@@ -42,7 +42,7 @@
 import android.se.omapi.SEService;
 import android.telephony.TelephonyManager;
 import android.util.Log;
-
+import android.os.SystemProperties;
 import com.android.se.Terminal.SecureElementReader;
 import com.android.se.internal.ByteArrayConverter;
 
@@ -203,7 +203,9 @@
     private void createTerminals() {
         // Check for all SE HAL implementations
         addTerminals(ESE_TERMINAL);
-        addTerminals(UICC_TERMINAL);
+        if (!SystemProperties.getBoolean("ro.radio.noril", false)) {
+            addTerminals(UICC_TERMINAL);
+       }
     }
 
     private void refreshUiccTerminals(int activeSimCount) {