commit 5ccd3466a23c18286993f45cb9ca35a99db4838e
author Jeff Sharkey <jsharkey@android.com> Sat Aug 12 00:28:33 2017 +0000
committer android-build-merger <android-build-merger@google.com> Sat Aug 12 00:28:33 2017 +0000
tree ff7c038b7f3d54cdcc1df39875ce1adab5799a45
parent 4b559a3b69c88287f01f34d78e68123c4759b1d8
parent 9aa5b26aed3e51043827dab82d64ee2bd1e2e576

Merge "Only destroy the storage area that had trouble." into oc-mr1-dev
am: 9aa5b26aed

Change-Id: I18e3a2797321c97e92d9cfd0e09b3c41e2e51683

services/core/java/com/android/server/pm/UserDataPreparer.java

diff --git a/services/core/java/com/android/server/pm/UserDataPreparer.java b/services/core/java/com/android/server/pm/UserDataPreparer.java
index fc00acc..b8b00af 100644
--- a/services/core/java/com/android/server/pm/UserDataPreparer.java
+++ b/services/core/java/com/android/server/pm/UserDataPreparer.java
@@ -99,8 +99,7 @@
         } catch (Exception e) {
             logCriticalInfo(Log.WARN, "Destroying user " + userId + " on volume " + volumeUuid
                     + " because we failed to prepare: " + e);
-            destroyUserDataLI(volumeUuid, userId,
-                    StorageManager.FLAG_STORAGE_DE | StorageManager.FLAG_STORAGE_CE);
+            destroyUserDataLI(volumeUuid, userId, flags);
 
             if (allowRecover) {
                 // Try one last time; if we fail again we're really in trouble