PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Correct name of PRIMARY_SUBSCRIPTION_LIST_CHANGED."

Browse Source 
am: bf857c7374

Change-Id: I2422f31d45e1b7242f8f73decd7eab5d4f33da3d
This commit is contained in:
Malcolm Chen
2019-04-08 16:06:13 -07:00
committed by android-build-merger
parent 544f60909b bf857c7374
commit d6875ddf82
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
AndroidManifest.xml
View File

@@ -2812,7 +2812,7 @@
<receiver android:name=".sim.SimSelectNotification"> <receiver android:name=".sim.SimSelectNotification">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.PRIMARY_SUBSCRIPTION_LIST_CHANGED"/> <action android:name="android.telephony.action.PRIMARY_SUBSCRIPTION_LIST_CHANGED"/>
</intent-filter> </intent-filter>
</receiver> </receiver>

4
src/com/android/settings/sim/SimSelectNotification.java
View File

@@ -30,6 +30,7 @@ import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.content.res.Resources; import android.content.res.Resources;
import android.telephony.SubscriptionManager; import android.telephony.SubscriptionManager;
import android.telephony.TelephonyManager;
import com.android.settings.R; import com.android.settings.R;
import com.android.settings.Settings.SimSettingsActivity; import com.android.settings.Settings.SimSettingsActivity;
@@ -45,6 +46,9 @@ public class SimSelectNotification extends BroadcastReceiver {
@Override @Override
public void onReceive(Context context, Intent intent) { public void onReceive(Context context, Intent intent) {
if (!TelephonyManager.ACTION_PRIMARY_SUBSCRIPTION_LIST_CHANGED.equals(intent.getAction())) {
return;
}
// Cancel any previous notifications // Cancel any previous notifications
cancelNotification(context); cancelNotification(context);
// Create a notification to tell the user that some defaults are missing // Create a notification to tell the user that some defaults are missing