diff options
| author | Adnan Begovic <adnan@cyngn.com> | 2015-12-16 13:10:19 -0800 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@cyanogenmod.org> | 2015-12-18 15:01:10 -0800 |
| commit | 5fc6f2e480c0f68ff9eb7c27412c9a01a5e87446 (patch) | |
| tree | 3c6a28063282b07d4fae1091640ff849cd93008d | |
| parent | ff9cea3ce65b02ba91321ddb6868c1c844b65840 (diff) | |
| download | packages_apps_Settings-5fc6f2e480c0f68ff9eb7c27412c9a01a5e87446.zip packages_apps_Settings-5fc6f2e480c0f68ff9eb7c27412c9a01a5e87446.tar.gz packages_apps_Settings-5fc6f2e480c0f68ff9eb7c27412c9a01a5e87446.tar.bz2 | |
Settings: Utilize frameworks sms prompt interfaces as fallback.
Ticket: CYNGNOS-1440
Change-Id: I0890d5cc25124dc94434216763cb8965986ca4b3
| -rw-r--r-- | src/com/android/settings/sim/SimDialogActivity.java | 6 | ||||
| -rw-r--r-- | src/com/android/settings/sim/SimSettings.java | 5 |
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( |