From 7615d11dd4b0dca37376730bb0161967f1215c4c Mon Sep 17 00:00:00 2001 From: Jeff Davidson Date: Fri, 14 Jul 2017 09:46:19 -0700 Subject: [PATCH] Temporarily disable eUICC factory reset handling. This seems to be causing users who elect not to wipe their eUICC on a factory reset to end up on the eSIM slot after the reset instead of the pSIM slot. Bug: 63693573 Test: TreeHugger + factory reset local test Change-Id: I414a16cde11e76ccc390e7a63a6803f5b402fe78 --- core/java/android/os/RecoverySystem.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/core/java/android/os/RecoverySystem.java b/core/java/android/os/RecoverySystem.java index 1f8de044b2808..7fa1c5acb6882 100644 --- a/core/java/android/os/RecoverySystem.java +++ b/core/java/android/os/RecoverySystem.java @@ -751,7 +751,9 @@ public class RecoverySystem { // Block until the ordered broadcast has completed. condition.block(); - wipeEuiccData(context, wipeEuicc); + // TODO(b/63693573): Uncomment this once the pSIM slot is restored as needed + // after the ensuing boot. Currently you end up stuck on the eSIM. + // wipeEuiccData(context, wipeEuicc); String shutdownArg = null; if (shutdown) {