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

Commit 10238e56 authored by Jeff Davidson's avatar Jeff Davidson Committed by android-build-merger
Browse files

Merge "Revert disabling of eSIM wipes/retains." into oc-dr1-dev 

am: acdcf37e

Change-Id: I10cc2501e38837f816c564716a6d157bc8f57ed6
parents c5f9c329 acdcf37e

core/java/android/os/RecoverySystem.java

+10 −4
Original line number Original line Diff line number Diff line
@@ -24,11 +24,11 @@ import android.annotation.SystemApi; 
import android.annotation.SystemService;

import android.annotation.SystemService;

import android.app.PendingIntent;

import android.app.PendingIntent;

import android.content.BroadcastReceiver;

import android.content.BroadcastReceiver;

import android.content.ContentResolver;

import android.content.Context;

import android.content.Context;

import android.content.Intent;

import android.content.Intent;

import android.content.IntentFilter;

import android.content.IntentFilter;

import android.content.pm.PackageManager;

import android.content.pm.PackageManager;

import android.os.UserManager;

import android.provider.Settings;

import android.provider.Settings;

import android.telephony.euicc.EuiccManager;

import android.telephony.euicc.EuiccManager;

import android.text.TextUtils;

import android.text.TextUtils;
@@ -751,9 +751,7 @@ public class RecoverySystem { 
        // Block until the ordered broadcast has completed.

        // Block until the ordered broadcast has completed.

        condition.block();

        condition.block();





        // TODO(b/63693573): Uncomment this once the pSIM slot is restored as needed

        wipeEuiccData(context, wipeEuicc);

        // after the ensuing boot. Currently you end up stuck on the eSIM.

        // wipeEuiccData(context, wipeEuicc);





        String shutdownArg = null;

        String shutdownArg = null;

        if (shutdown) {

        if (shutdown) {
@@ -770,6 +768,14 @@ public class RecoverySystem { 
    }

    }





    private static void wipeEuiccData(Context context, final boolean isWipeEuicc) {

    private static void wipeEuiccData(Context context, final boolean isWipeEuicc) {

        ContentResolver cr = context.getContentResolver();

        if (Settings.Global.getInt(cr, Settings.Global.EUICC_PROVISIONED, 0) == 0) {

            // If the eUICC isn't provisioned, there's no reason to either wipe or retain profiles,

            // as there's nothing to wipe nor retain.

            Log.d(TAG, "Skipping eUICC wipe/retain as it is not provisioned");

            return;

        }



        EuiccManager euiccManager = (EuiccManager) context.getSystemService(

        EuiccManager euiccManager = (EuiccManager) context.getSystemService(

                Context.EUICC_SERVICE);

                Context.EUICC_SERVICE);

        if (euiccManager != null && euiccManager.isEnabled()) {

        if (euiccManager != null && euiccManager.isEnabled()) {