commit e3c214b8c1624426c905ab9907ee98e7ccf559e8
author Treehugger Robot <android-build-prod@system.gserviceaccount.com> Fri Aug 14 09:09:53 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Aug 14 09:09:53 2020 +0000
tree 20df2d6dd27da256626953788e728409659f7f13
parent 45ad2acf800e18d47cc38ea85452e04df3c1a91f
parent 41b06200a07439d225c8ef02417dd300b1caf374

Merge "FR61513: Hide Use SIM in Single SIM for HAL 1.4" into r-keystone-qcom-dev

src/com/android/settings/network/telephony/MobileNetworkSwitchController.java

diff --git a/src/com/android/settings/network/telephony/MobileNetworkSwitchController.java b/src/com/android/settings/network/telephony/MobileNetworkSwitchController.java
index f573ec7..0a3aea9 100644
--- a/src/com/android/settings/network/telephony/MobileNetworkSwitchController.java
+++ b/src/com/android/settings/network/telephony/MobileNetworkSwitchController.java
@@ -110,6 +110,13 @@
             return;
         }
 
+        if (mTelephonyManager.getActiveModemCount() == 1 && !mSubscriptionManager.
+                canDisablePhysicalSubscription()) {
+            Log.d(TAG, "update: Hide SIM option for 1.4 HAL in single sim");
+            mSwitchBar.hide();
+            return;
+        }
+
         for (SubscriptionInfo info : SubscriptionUtil.getAvailableSubscriptions(mContext)) {
             if (info.getSubscriptionId() == mSubId) {
                 mSubInfo = info;
@@ -122,7 +129,6 @@
             Log.d(TAG, "update: disable switchbar, isEcbmEnabled=" + isEcbmEnabled +
                     ", callstate=" + mCallState);
             mSwitchBar.setEnabled(false);
-            return;
         } else {
             mSwitchBar.setEnabled(true);
         }