Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fafc8c1e authored by Alex Buynytskyy's avatar Alex Buynytskyy Committed by Automerger Merge Worker
Browse files

Merge "Make sure there is always a user." into udc-dev am: 9d1745fb 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21693043



Change-Id: I9d46f5be8b8fffc012bd3745d71265a1d87aa89f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 19f5fa4e 9d1745fb

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

+7 −0
Original line number Diff line number Diff line
@@ -3635,6 +3635,13 @@ public class UserManagerService extends IUserManager.Stub { 
        } finally {

            IoUtils.closeQuietly(fis);

        }



        synchronized (mUsersLock) {

            if (mUsers.size() == 0) {

                Slog.e(LOG_TAG, "mUsers is empty, fallback to single user");

                fallbackToSingleUserLP();

            }

        }

    }



    /**