From e0cf5ece325acdc3b123187ed9dceb44cf9fad58 Mon Sep 17 00:00:00 2001
From: Malcolm Chen <refuhoo@google.com>
Date: Wed, 27 Mar 2019 17:45:29 -0700
Subject: [PATCH] Correct name of PRIMARY_SUBSCRIPTION_LIST_CHANGED.

Correct name of PRIMARY_SUBSCRIPTION_LIST_CHANGED in manifest.
Also, make sure SimSelectNotification only listens to that intent.

Bug: 128645056
Test: manual
Change-Id: I008e5346ff1e015d1aa57ca31844426e33bd99b8
Merged-In: I008e5346ff1e015d1aa57ca31844426e33bd99b8
---
 AndroidManifest.xml                                     | 2 +-
 src/com/android/settings/sim/SimSelectNotification.java | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 0a0e4034191..45035382350 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -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>
 
diff --git a/src/com/android/settings/sim/SimSelectNotification.java b/src/com/android/settings/sim/SimSelectNotification.java
index 4f3b9bc3f79..a1e942a8abe 100644
--- a/src/com/android/settings/sim/SimSelectNotification.java
+++ b/src/com/android/settings/sim/SimSelectNotification.java
@@ -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