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

Commit fcb2b433 authored by Chen Xu's avatar Chen Xu Committed by android-build-merger
Browse files

Merge "using the correct intent extra for subId" am: 954e4c54 

am: 2640a014

Change-Id: I616bacbb38fc8dd674fd4b2127d0b029157010eb
parents 9f013a71 2640a014

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

+2 −0
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ import android.os.Message; 
import android.os.PersistableBundle;

import android.telephony.CarrierConfigManager;

import android.telephony.Rlog;

import android.telephony.SubscriptionManager;

import android.text.TextUtils;

import android.util.LocalLog;

import android.util.Log;
@@ -313,6 +314,7 @@ public class CarrierSignalAgent extends Handler { 
                return;

            }



            signal.putExtra(SubscriptionManager.EXTRA_SUBSCRIPTION_INDEX, mPhone.getSubId());

            signal.putExtra(PhoneConstants.SUBSCRIPTION_KEY, mPhone.getSubId());

            signal.addFlags(Intent.FLAG_RECEIVER_FOREGROUND);

            if (!wakeup) signal.setFlags(Intent.FLAG_EXCLUDE_STOPPED_PACKAGES);

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

+2 −0
Original line number Diff line number Diff line
@@ -1683,6 +1683,7 @@ public class SubscriptionController extends ISub.Stub { 
        intent.addFlags(Intent.FLAG_RECEIVER_REPLACE_PENDING

                | Intent.FLAG_RECEIVER_INCLUDE_BACKGROUND);

        intent.putExtra(PhoneConstants.SUBSCRIPTION_KEY, subId);

        intent.putExtra(SubscriptionManager.EXTRA_SUBSCRIPTION_INDEX, subId);

        mContext.sendStickyBroadcastAsUser(intent, UserHandle.ALL);

    }
@@ -1767,6 +1768,7 @@ public class SubscriptionController extends ISub.Stub { 
        intent.addFlags(Intent.FLAG_RECEIVER_REPLACE_PENDING

                | Intent.FLAG_RECEIVER_INCLUDE_BACKGROUND);

        intent.putExtra(PhoneConstants.SUBSCRIPTION_KEY, subId);

        intent.putExtra(SubscriptionManager.EXTRA_SUBSCRIPTION_INDEX, subId);

        mContext.sendStickyBroadcastAsUser(intent, UserHandle.ALL);

    }