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

Commit 850d084c authored by Malcolm Chen's avatar Malcolm Chen Committed by android-build-merger
Browse files

Move intents ACTION_DEFAULT_SMS_SUBSCRIPTION_CHANGED,... 

Move intents ACTION_DEFAULT_SMS_SUBSCRIPTION_CHANGED, ACTION_DEFAULT_SUBSCRIPTION_CHANGED and EXTRA_SUBSCRIPTION_INDEX from Intent class to SubscriptionManager class.
am: d17f611f

Change-Id: Iafcf8f862c4fa81de4cec7def7ed06236465130d
parents 86fade22 d17f611f

src/java/com/android/internal/telephony/SubscriptionController.java

+4 −3
Original line number Original line Diff line number Diff line
@@ -38,7 +38,7 @@ import android.telephony.TelephonyManager; 
import android.text.TextUtils;

import android.text.TextUtils;

import android.text.format.Time;

import android.text.format.Time;

import android.util.Log;

import android.util.Log;

import java.util.Objects;



import com.android.internal.telephony.IccCardConstants.State;

import com.android.internal.telephony.IccCardConstants.State;





import java.io.FileDescriptor;

import java.io.FileDescriptor;
@@ -51,6 +51,7 @@ import java.util.LinkedList; 
import java.util.List;

import java.util.List;

import java.util.Map;

import java.util.Map;

import java.util.Map.Entry;

import java.util.Map.Entry;

import java.util.Objects;

import java.util.Set;

import java.util.Set;

import java.util.concurrent.ConcurrentHashMap;

import java.util.concurrent.ConcurrentHashMap;
@@ -1343,11 +1344,11 @@ public class SubscriptionController extends ISub.Stub { 
    private void broadcastDefaultSmsSubIdChanged(int subId) {

    private void broadcastDefaultSmsSubIdChanged(int subId) {

        // Broadcast an Intent for default sms sub change

        // Broadcast an Intent for default sms sub change

        if (DBG) logdl("[broadcastDefaultSmsSubIdChanged] subId=" + subId);

        if (DBG) logdl("[broadcastDefaultSmsSubIdChanged] subId=" + subId);

        Intent intent = new Intent(Intent.ACTION_DEFAULT_SMS_SUBSCRIPTION_CHANGED);

        Intent intent = new Intent(SubscriptionManager.ACTION_DEFAULT_SMS_SUBSCRIPTION_CHANGED);

        intent.addFlags(Intent.FLAG_RECEIVER_REPLACE_PENDING

        intent.addFlags(Intent.FLAG_RECEIVER_REPLACE_PENDING

                | Intent.FLAG_RECEIVER_INCLUDE_BACKGROUND);

                | Intent.FLAG_RECEIVER_INCLUDE_BACKGROUND);

        intent.putExtra(PhoneConstants.SUBSCRIPTION_KEY, subId);

        intent.putExtra(PhoneConstants.SUBSCRIPTION_KEY, subId);

        intent.putExtra(Intent.EXTRA_SUBSCRIPTION_INDEX, subId);

        intent.putExtra(SubscriptionManager.EXTRA_SUBSCRIPTION_INDEX, subId);

        mContext.sendStickyBroadcastAsUser(intent, UserHandle.ALL);

        mContext.sendStickyBroadcastAsUser(intent, UserHandle.ALL);

    }

    }