Merge \"Ignore serial number checks when emulating FBE.\" into nyc-mr1-dev

am: 12f6687bd5

Change-Id: I2ebbb26b8605224d225b1c396dd997172a51f40b

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

@@ -2961,6 +2961,14 @@ public class UserManagerService extends IUserManager.Stub {
      *             number is mismatched.
      */
     public static void enforceSerialNumber(File file, int serialNumber) throws IOException {
+        if (StorageManager.isFileEncryptedEmulatedOnly()) {
+            // When we're emulating FBE, the directory may have been chmod
+            // 000'ed, meaning we can't read the serial number to enforce it;
+            // instead of destroying the user, just log a warning.
+            Slog.w(LOG_TAG, "Device is emulating FBE; assuming current serial number is valid");
+            return;
+        }
+
         final int foundSerial = getSerialNumber(file);
         Slog.v(LOG_TAG, "Found " + file + " with serial number " + foundSerial);