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

Commit 19b07e9e authored by Jack Nudelman's avatar Jack Nudelman Committed by Automerger Merge Worker
Browse files

Merge "Trigger per-sim configs restore when sim inserted." into sc-dev am: b8645017 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/13483701

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6648d72ca2d36576255d0ebd97dc4b29a314274d
parents 3458787a b8645017

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

+27 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ import android.content.ContentResolver; 
import android.content.ContentValues;

import android.content.Context;

import android.content.Intent;

import android.database.ContentObserver;

import android.database.Cursor;

import android.graphics.Bitmap;

import android.graphics.BitmapFactory;
@@ -63,6 +64,7 @@ import android.text.TextUtils; 
import android.util.LocalLog;

import android.util.Log;



import com.android.ims.ImsManager;

import com.android.internal.annotations.VisibleForTesting;

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

import com.android.internal.telephony.dataconnection.DataEnabledOverride;
@@ -359,6 +361,29 @@ public class SubscriptionController extends ISub.Stub { 
        invalidateActiveDataSubIdCaches();

        invalidateSlotIndexCaches();



        mContext.getContentResolver().registerContentObserver(

                SubscriptionManager.SIM_INFO_SUW_RESTORE_CONTENT_URI, false,

                new ContentObserver(new Handler()) {

                    @Override

                    public void onChange(boolean selfChange, Uri uri) {

                        if (uri.equals(SubscriptionManager.SIM_INFO_SUW_RESTORE_CONTENT_URI)) {

                            refreshCachedActiveSubscriptionInfoList();

                            notifySubscriptionInfoChanged();



                            SubscriptionManager subManager = SubscriptionManager.from(mContext);

                            for (SubscriptionInfo subInfo : getActiveSubscriptionInfoList(

                                    mContext.getOpPackageName(), mContext.getAttributionTag())) {

                                if (SubscriptionController.getInstance()

                                        .isActiveSubId(subInfo.getSubscriptionId())) {

                                    ImsManager imsManager = ImsManager.getInstance(mContext,

                                            subInfo.getSimSlotIndex());

                                    imsManager.updateImsServiceConfig();

                                }

                            }

                        }

                    }

                });



        if (DBG) logdl("[SubscriptionController] init by Context");

    }
@@ -1327,6 +1352,8 @@ public class SubscriptionController extends ISub.Stub { 
                        setDisplayName = true;

                        Uri uri = insertEmptySubInfoRecord(uniqueId, slotIndex);

                        if (DBG) logdl("[addSubInfoRecord] New record created: " + uri);

                        SubscriptionManager subManager = SubscriptionManager.from(mContext);

                        subManager.restoreSimSpecificSettingsForIccIdFromBackup(uniqueId);

                    } else { // there are matching records in the database for the given ICC_ID

                        int subId = cursor.getInt(0);

                        int oldSimInfoId = cursor.getInt(1);