2 files changed, 11 insertions, 0 deletions
diff --git a/src/com/android/settings/sim/SimDialogActivity.java b/src/com/android/settings/sim/SimDialogActivity.java
index d54336c..df4a8d5 100644
--- a/src/com/android/settings/sim/SimDialogActivity.java
+++ b/src/com/android/settings/sim/SimDialogActivity.java
@@ -28,6 +28,7 @@ import android.os.ServiceManager;
 import android.telecom.PhoneAccount;
 import android.telecom.PhoneAccountHandle;
 import android.telecom.TelecomManager;
+import android.telephony.SmsManager;
 import android.telephony.SubscriptionInfo;
 import android.telephony.SubscriptionManager;
 import android.telephony.TelephonyManager;
@@ -205,6 +206,11 @@ public class SimDialogActivity extends Activity {
                                 } catch (NullPointerException ex) {
                                     Log.e(TAG, "NullPointerException @setSMSPromptEnabled" + ex);
                                 }
+
+                                //Regardless, ignore the secondary telephony framework
+                                if (mExtTelephony == null) {
+                                    SmsManager.getDefault().setSMSPromptEnabled(isSmsPrompt);
+                                }
                                 break;
                             default:
                                 throw new IllegalArgumentException("Invalid dialog type "
diff --git a/src/com/android/settings/sim/SimSettings.java b/src/com/android/settings/sim/SimSettings.java
index f16fc1c..6c9057d 100644
--- a/src/com/android/settings/sim/SimSettings.java
+++ b/src/com/android/settings/sim/SimSettings.java
@@ -38,6 +38,7 @@ import android.preference.PreferenceCategory;
 import android.provider.SearchIndexableResource;
 import android.provider.Settings;
 import android.telephony.PhoneStateListener;
+import android.telephony.SmsManager;
 import android.telephony.SubscriptionInfo;
 import android.telephony.SubscriptionManager;
 import android.telephony.TelephonyManager;
@@ -226,6 +227,10 @@ public class SimSettings extends RestrictedSettingsFragment implements Indexable
         } catch (NullPointerException ex) {
             loge("NullPointerException @isSMSPromptEnabled" + ex);
         }
+        // External telephony interfaces may not exist, fall back to our impl
+        if (mExtTelephony == null) {
+            isSMSPrompt = SmsManager.getDefault().isSMSPromptEnabled();
+        }
         log("[updateSmsValues] isSMSPrompt: " + isSMSPrompt);
         if (isSMSPrompt || sir == null) {
             simPref.setSummary(mContext.getResources().getString(