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

Commit 3b050a96 authored by Fyodor Kupolov's avatar Fyodor Kupolov Committed by android-build-merger
Browse files

Merge "Do not enforce unlocked state when there is no caller" into nyc-dev 

am: b9f7541d

* commit 'b9f7541d':
  Do not enforce unlocked state when there is no caller

Change-Id: I2b8b00a730e7b0b27da6ad360b76c82c6bc1b178
parents cb60c8bf b9f7541d

services/appwidget/java/com/android/server/appwidget/AppWidgetServiceImpl.java

+9 −3
Original line number Diff line number Diff line
@@ -656,11 +656,15 @@ class AppWidgetServiceImpl extends IAppWidgetService.Stub implements WidgetBacku 
    }



    private void ensureGroupStateLoadedLocked(int userId) {

        if (!mUserManager.isUserUnlockingOrUnlocked(userId)) {

        ensureGroupStateLoadedLocked(userId, /* enforceUserUnlockingOrUnlocked */ true );

    }



    private void ensureGroupStateLoadedLocked(int userId, boolean enforceUserUnlockingOrUnlocked) {

        if (enforceUserUnlockingOrUnlocked && !mUserManager.isUserUnlockingOrUnlocked(userId)) {

            throw new IllegalStateException(

                    "User " + userId + " must be unlocked for widgets to be available");

        }

        if (isProfileWithLockedParent(userId)) {

        if (enforceUserUnlockingOrUnlocked && isProfileWithLockedParent(userId)) {

            throw new IllegalStateException(

                    "Profile " + userId + " must have unlocked parent");

        }
@@ -3945,7 +3949,9 @@ class AppWidgetServiceImpl extends IAppWidgetService.Stub implements WidgetBacku 
        @Override

        public void run() {

            synchronized (mLock) {

                ensureGroupStateLoadedLocked(mUserId);

                // No need to enforce unlocked state when there is no caller. User can be in the

                // stopping state or removed by the time the message is processed

                ensureGroupStateLoadedLocked(mUserId, false /* enforceUserUnlockingOrUnlocked */ );

                saveStateLocked(mUserId);

            }

        }