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

Commit d6875ddf authored by Malcolm Chen's avatar Malcolm Chen Committed by android-build-merger
Browse files

Merge "Correct name of PRIMARY_SUBSCRIPTION_LIST_CHANGED." 

am: bf857c73

Change-Id: I2422f31d45e1b7242f8f73decd7eab5d4f33da3d
parents 544f6090 bf857c73

AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -2812,7 +2812,7 @@ 


        <receiver android:name=".sim.SimSelectNotification">

            <intent-filter>

                <action android:name="android.intent.action.PRIMARY_SUBSCRIPTION_LIST_CHANGED"/>

                <action android:name="android.telephony.action.PRIMARY_SUBSCRIPTION_LIST_CHANGED"/>

            </intent-filter>

        </receiver>

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

+4 −0
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ import android.content.Context; 
import android.content.Intent;

import android.content.res.Resources;

import android.telephony.SubscriptionManager;

import android.telephony.TelephonyManager;



import com.android.settings.R;

import com.android.settings.Settings.SimSettingsActivity;
@@ -45,6 +46,9 @@ public class SimSelectNotification extends BroadcastReceiver { 


    @Override

    public void onReceive(Context context, Intent intent) {

        if (!TelephonyManager.ACTION_PRIMARY_SUBSCRIPTION_LIST_CHANGED.equals(intent.getAction())) {

            return;

        }

        // Cancel any previous notifications

        cancelNotification(context);

        // Create a notification to tell the user that some defaults are missing