From f2fca31c51fe3268f66a95d0172099949b252d6e Mon Sep 17 00:00:00 2001 From: Malcolm Chen Date: Fri, 22 Mar 2019 17:59:00 -0700 Subject: [PATCH] Clean up a few names of Telephony intent extra. Bug: 128645056 Test: build Change-Id: I5d47b132abb722282bd10b9fbb362fb1f1d32f11 --- src/com/android/settings/sim/SimSelectNotification.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/com/android/settings/sim/SimSelectNotification.java b/src/com/android/settings/sim/SimSelectNotification.java index 891d1719e6..4f3b9bc3f7 100644 --- a/src/com/android/settings/sim/SimSelectNotification.java +++ b/src/com/android/settings/sim/SimSelectNotification.java @@ -16,11 +16,11 @@ 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_ALL; 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_SUBSCRIPTION_ID; import android.app.NotificationChannel; import android.app.NotificationManager; @@ -52,8 +52,8 @@ public class SimSelectNotification extends BroadcastReceiver { int dialogType = intent.getIntExtra(EXTRA_DEFAULT_SUBSCRIPTION_SELECT_TYPE, EXTRA_DEFAULT_SUBSCRIPTION_SELECT_TYPE_NONE); - if (dialogType == EXTRA_DEFAULT_SUBSCRIPTION_SELECT_FOR_ALL_TYPES) { - int subId = intent.getIntExtra(EXTRA_DEFAULT_SUBSCRIPTION_ID, + if (dialogType == EXTRA_DEFAULT_SUBSCRIPTION_SELECT_TYPE_ALL) { + int subId = intent.getIntExtra(EXTRA_SUBSCRIPTION_ID, SubscriptionManager.DEFAULT_SUBSCRIPTION_ID); int slotIndex = SubscriptionManager.getSlotIndex(subId); // If there is only one subscription, ask if user wants to use if for everything -- 2.11.0