From 214bea1b599ba2deccfca6e72a77bf411c724696 Mon Sep 17 00:00:00 2001 From: Jeff Sharkey Date: Tue, 19 Apr 2016 11:39:42 -0600 Subject: Ignore user serial numbers in core-only mode. When booting in core-only mode, our data partition is a tmpfs which doesn't support xattrs, so we can't set/enforce user serial numbers. Bug: 28254840 Change-Id: Id83c551c7c603a4cd5043e06f7161441b2dfaa8b --- services/core/java/com/android/server/pm/PackageManagerService.java | 6 +++--- 1 file 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) { -- cgit v1.2.3-59-g8ed1b