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

Commit 22a763c6 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Do not use hidden putIntForUser am: 4573cc60 am: 0788c327 

Change-Id: Ie65080d7a24dbb80fb68ff1779b07f519b0a7238
parents 6ca95616 0788c327

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

+5 −5
Original line number Diff line number Diff line
@@ -55,7 +55,6 @@ import android.telephony.euicc.EuiccManager; 
import android.text.TextUtils;

import android.util.Pair;



import com.android.telephony.Rlog;

import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.telephony.euicc.EuiccController;

import com.android.internal.telephony.metrics.TelephonyMetrics;
@@ -64,6 +63,7 @@ import com.android.internal.telephony.uicc.IccUtils; 
import com.android.internal.telephony.uicc.UiccCard;

import com.android.internal.telephony.uicc.UiccController;

import com.android.internal.telephony.uicc.UiccSlot;

import com.android.telephony.Rlog;



import java.io.FileDescriptor;

import java.io.PrintWriter;
@@ -174,7 +174,7 @@ public class SubscriptionInfoUpdater extends Handler { 
                    mCurrentlyActiveUserId = newUserId;

                    CarrierAppUtils.disableCarrierAppsUntilPrivileged(sContext.getOpPackageName(),

                            mPackageManager, TelephonyManager.getDefault(),

                            sContext.getContentResolver(), mCurrentlyActiveUserId);

                            mCurrentlyActiveUserId, sContext);



                    if (reply != null) {

                        try {
@@ -191,8 +191,8 @@ public class SubscriptionInfoUpdater extends Handler { 
            logd("Couldn't get current user ID; guessing it's 0: " + e.getMessage());

        }

        CarrierAppUtils.disableCarrierAppsUntilPrivileged(sContext.getOpPackageName(),

                mPackageManager, TelephonyManager.getDefault(), sContext.getContentResolver(),

                mCurrentlyActiveUserId);

                mPackageManager, TelephonyManager.getDefault(),

                mCurrentlyActiveUserId, sContext);

    }



    /**
@@ -587,7 +587,7 @@ public class SubscriptionInfoUpdater extends Handler { 
        // Update set of enabled carrier apps now that the privilege rules may have changed.

        CarrierAppUtils.disableCarrierAppsUntilPrivileged(sContext.getOpPackageName(),

                mPackageManager, TelephonyManager.getDefault(),

                sContext.getContentResolver(), mCurrentlyActiveUserId);

                mCurrentlyActiveUserId, sContext);



        /**

         * The sim loading sequence will be