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

2016-04-25 21:59:57 +00:00
parent 3a10c1e86d 02179da30e
commit 436308f88b
1 changed files with 2 additions and 1 deletions
--- a/services/core/java/com/android/server/pm/PackageManagerService.java
+++ b/services/core/java/com/android/server/pm/PackageManagerService.java
@@ -18819,7 +18819,8 @@ Slog.v(TAG, ":: stepped forward, applying functor at tag " + parser.getName());
        } 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