diff options
| author | 2016-04-19 17:58:22 +0000 | |
|---|---|---|
| committer | 2016-04-19 17:58:24 +0000 | |
| commit | adfa806cfbd6ad51fe3ec8c4cea808ebd2967038 (patch) | |
| tree | 32d3657f2758a4d944b92a9dbd7beaebaa2a49c6 | |
| parent | 6e08a629c4ed61c4cb1132576422189e03bda965 (diff) | |
| parent | 214bea1b599ba2deccfca6e72a77bf411c724696 (diff) | |
Merge "Ignore user serial numbers in core-only mode." into nyc-dev
| -rw-r--r-- | services/core/java/com/android/server/pm/PackageManagerService.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java index 4819de5a84fb..43250ba9271d 100644 --- a/services/core/java/com/android/server/pm/PackageManagerService.java +++ b/services/core/java/com/android/server/pm/PackageManagerService.java @@ -18679,11 +18679,11 @@ Slog.v(TAG, ":: stepped forward, applying functor at tag " + parser.getName()); try { storage.prepareUserStorage(volumeUuid, userId, userSerial, flags); - if ((flags & StorageManager.FLAG_STORAGE_DE) != 0) { + if ((flags & StorageManager.FLAG_STORAGE_DE) != 0 && !mOnlyCore) { UserManagerService.enforceSerialNumber( Environment.getDataUserDeDirectory(volumeUuid, userId), userSerial); } - if ((flags & StorageManager.FLAG_STORAGE_CE) != 0) { + if ((flags & StorageManager.FLAG_STORAGE_CE) != 0 && !mOnlyCore) { UserManagerService.enforceSerialNumber( Environment.getDataUserCeDirectory(volumeUuid, userId), userSerial); } @@ -18771,7 +18771,7 @@ Slog.v(TAG, ":: stepped forward, applying functor at tag " + parser.getName()); logCriticalInfo(Log.WARN, "Destroying user directory " + file + " because no matching user was found"); destroyUser = true; - } else { + } else if (!mOnlyCore) { try { UserManagerService.enforceSerialNumber(file, info.serialNumber); } catch (IOException e) { |