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

Commit 681bf8a6 authored by Xiangyu/Malcolm Chen's avatar Xiangyu/Malcolm Chen Committed by android-build-merger
Browse files

Merge "Clean up a few names of Telephony intent extra." 

am: 6bb737c5

Change-Id: I1a2232458ab8fd4a89c1ada1e5195bf346e31074
parents fa412244 6bb737c5

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

+4 −4
Original line number Diff line number Diff line
@@ -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