Clean up a few names of Telephony intent extra.
Bug: 128645056 Test: build Change-Id: I5d47b132abb722282bd10b9fbb362fb1f1d32f11
This commit is contained in:
@@ -16,11 +16,11 @@
|
|||||||
|
|
||||||
package com.android.settings.sim;
|
package com.android.settings.sim;
|
||||||
|
|
||||||
import static android.telephony.TelephonyManager.EXTRA_DEFAULT_SUBSCRIPTION_ID;
|
|
||||||
import static android.telephony.TelephonyManager.EXTRA_DEFAULT_SUBSCRIPTION_SELECT_FOR_ALL_TYPES;
|
|
||||||
import static android.telephony.TelephonyManager.EXTRA_DEFAULT_SUBSCRIPTION_SELECT_TYPE;
|
import static android.telephony.TelephonyManager.EXTRA_DEFAULT_SUBSCRIPTION_SELECT_TYPE;
|
||||||
|
import static android.telephony.TelephonyManager.EXTRA_DEFAULT_SUBSCRIPTION_SELECT_TYPE_ALL;
|
||||||
import static android.telephony.TelephonyManager.EXTRA_DEFAULT_SUBSCRIPTION_SELECT_TYPE_DATA;
|
import static android.telephony.TelephonyManager.EXTRA_DEFAULT_SUBSCRIPTION_SELECT_TYPE_DATA;
|
||||||
import static android.telephony.TelephonyManager.EXTRA_DEFAULT_SUBSCRIPTION_SELECT_TYPE_NONE;
|
import static android.telephony.TelephonyManager.EXTRA_DEFAULT_SUBSCRIPTION_SELECT_TYPE_NONE;
|
||||||
|
import static android.telephony.TelephonyManager.EXTRA_SUBSCRIPTION_ID;
|
||||||
|
|
||||||
import android.app.NotificationChannel;
|
import android.app.NotificationChannel;
|
||||||
import android.app.NotificationManager;
|
import android.app.NotificationManager;
|
||||||
@@ -52,8 +52,8 @@ public class SimSelectNotification extends BroadcastReceiver {
|
|||||||
|
|
||||||
int dialogType = intent.getIntExtra(EXTRA_DEFAULT_SUBSCRIPTION_SELECT_TYPE,
|
int dialogType = intent.getIntExtra(EXTRA_DEFAULT_SUBSCRIPTION_SELECT_TYPE,
|
||||||
EXTRA_DEFAULT_SUBSCRIPTION_SELECT_TYPE_NONE);
|
EXTRA_DEFAULT_SUBSCRIPTION_SELECT_TYPE_NONE);
|
||||||
if (dialogType == EXTRA_DEFAULT_SUBSCRIPTION_SELECT_FOR_ALL_TYPES) {
|
if (dialogType == EXTRA_DEFAULT_SUBSCRIPTION_SELECT_TYPE_ALL) {
|
||||||
int subId = intent.getIntExtra(EXTRA_DEFAULT_SUBSCRIPTION_ID,
|
int subId = intent.getIntExtra(EXTRA_SUBSCRIPTION_ID,
|
||||||
SubscriptionManager.DEFAULT_SUBSCRIPTION_ID);
|
SubscriptionManager.DEFAULT_SUBSCRIPTION_ID);
|
||||||
int slotIndex = SubscriptionManager.getSlotIndex(subId);
|
int slotIndex = SubscriptionManager.getSlotIndex(subId);
|
||||||
// If there is only one subscription, ask if user wants to use if for everything
|
// If there is only one subscription, ask if user wants to use if for everything
|
||||||
|
Reference in New Issue
Block a user