Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5fc6f2e4 authored by Adnan Begovic's avatar Adnan Begovic Committed by Gerrit Code Review
Browse files

Settings: Utilize frameworks sms prompt interfaces as fallback. 

Ticket: CYNGNOS-1440
Change-Id: I0890d5cc25124dc94434216763cb8965986ca4b3
parent ff9cea3c

src/com/android/settings/sim/SimDialogActivity.java

+6 −0
Original line number Diff line number Diff line
@@ -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 "

src/com/android/settings/sim/SimSettings.java

+5 −0
Original line number Diff line number Diff line
@@ -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(