summaryrefslogtreecommitdiff
path: root/core/java/android
diff options
context:
space:
mode:
authorJeff Davidson <jpd@google.com>2017-07-14 20:07:26 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-07-14 20:07:26 +0000
commit7183acc20e49f6b2c6e4fe74aa92cafdf2f7464f (patch)
treefc9e41670ab1978f746731982207d4c73a3abb34 /core/java/android
parent14c291e322ae3a336804d9b3491bae723d81c80a (diff)
parentc0ce489df72ec216dd145369d3f8b39a105d7fc4 (diff)
Merge "Temporarily disable eUICC factory reset handling." into oc-dr1-dev
am: c0ce489df7 Change-Id: Iea42444468b78c604f32ffd4a47eb8a1c762d2ab
Diffstat (limited to 'core/java/android')
-rw-r--r--core/java/android/os/RecoverySystem.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/core/java/android/os/RecoverySystem.java b/core/java/android/os/RecoverySystem.java
index 1f8de044b280..7fa1c5acb688 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) {