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

Commit 08301b74 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Switched out PhoneConstants.PhoneKey"

parents 827940b1 8f2e2f2e

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

+2 −1
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ import android.database.sqlite.SQLiteConstraintException; 
import android.os.UserHandle;

import android.provider.Telephony;

import android.telephony.ImsiEncryptionInfo;

import android.telephony.SubscriptionManager;

import android.telephony.TelephonyManager;

import android.text.TextUtils;

import android.util.Log;
@@ -197,7 +198,7 @@ public class CarrierInfoManager { 
        mLastAccessResetCarrierKey = now;

        deleteCarrierInfoForImsiEncryption(context);

        Intent resetIntent = new Intent(TelephonyIntents.ACTION_CARRIER_CERTIFICATE_DOWNLOAD);

        resetIntent.putExtra(PhoneConstants.PHONE_KEY, mPhoneId);

        SubscriptionManager.putPhoneIdAndSubIdExtra(resetIntent, mPhoneId);

        context.sendBroadcastAsUser(resetIntent, UserHandle.ALL);

    }

src/java/com/android/internal/telephony/uicc/IsimUiccRecords.java

+3 −3
Original line number Diff line number Diff line
@@ -21,11 +21,11 @@ import android.content.Context; 
import android.content.Intent;

import android.os.AsyncResult;

import android.os.Message;

import com.android.telephony.Rlog;

import android.telephony.SubscriptionManager;



import com.android.internal.telephony.CommandsInterface;

import com.android.internal.telephony.PhoneConstants;

import com.android.internal.telephony.gsm.SimTlv;

import com.android.telephony.Rlog;



import java.io.FileDescriptor;

import java.io.PrintWriter;
@@ -352,7 +352,7 @@ public class IsimUiccRecords extends IccRecords implements IsimRecords { 
    private void broadcastRefresh() {

        Intent intent = new Intent(INTENT_ISIM_REFRESH);

        log("send ISim REFRESH: " + INTENT_ISIM_REFRESH);

        intent.putExtra(PhoneConstants.PHONE_KEY, mParentApp.getPhoneId());

        SubscriptionManager.putPhoneIdAndSubIdExtra(intent, mParentApp.getPhoneId());

        mContext.sendBroadcast(intent);

    }