Merge "Only destroy the storage area that had trouble." into oc-mr1-dev (9aa5b26a) · Commits · e / os / android_frameworks_base

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

+1 −2

Original line number	Diff line number	Diff line
		@@ -99,8 +99,7 @@ class UserDataPreparer {
		} 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