commit 436308f88b8f165f834a6b37f7638d6d4b7a6ca7
author Jeff Sharkey <jsharkey@google.com> Mon Apr 25 21:59:57 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Apr 25 21:59:59 2016 +0000
tree 60ce0bd6bf0adbd9aca81159647df221adb1a96d
parent 3a10c1e86db9843462660d825a9673a3c72ccdd6
parent 02179da30ecec5770341d42c0545f62b33b687ce

Merge "Destroy both CE and DE data when corrupted." into nyc-dev

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

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