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

Commit 3294fc06 authored by Fyodor Kupolov's avatar Fyodor Kupolov Committed by Android (Google) Code Review
Browse files

Merge "Do not enforce unlocked state for system calls"

parents fdc44dc7 e5d91213

services/print/java/com/android/server/print/PrintManagerService.java

+16 −8
Original line number Diff line number Diff line
@@ -728,7 +728,8 @@ public final class PrintManagerService extends SystemService { 
                @Override

                public void onPackageModified(String packageName) {

                    if (!mUserManager.isUserUnlockingOrUnlocked(getChangingUserId())) return;

                    UserState userState = getOrCreateUserStateLocked(getChangingUserId(), false);

                    UserState userState = getOrCreateUserStateLocked(getChangingUserId(), false,

                            false /* enforceUserUnlockingOrUnlocked */);



                    synchronized (mLock) {

                        if (hadPrintService(userState, packageName)
@@ -743,7 +744,8 @@ public final class PrintManagerService extends SystemService { 
                @Override

                public void onPackageRemoved(String packageName, int uid) {

                    if (!mUserManager.isUserUnlockingOrUnlocked(getChangingUserId())) return;

                    UserState userState = getOrCreateUserStateLocked(getChangingUserId(), false);

                    UserState userState = getOrCreateUserStateLocked(getChangingUserId(), false,

                            false /* enforceUserUnlockingOrUnlocked */);



                    synchronized (mLock) {

                        if (hadPrintService(userState, packageName)) {
@@ -762,8 +764,8 @@ public final class PrintManagerService extends SystemService { 
                        // A background user/profile's print jobs are running but there is

                        // no UI shown. Hence, if the packages of such a user change we need

                        // to handle it as the change may affect ongoing print jobs.

                        UserState userState = getOrCreateUserStateLocked(getChangingUserId(),

                                false);

                        UserState userState = getOrCreateUserStateLocked(getChangingUserId(), false,

                                false /* enforceUserUnlockingOrUnlocked */);

                        boolean stoppedSomePackages = false;



                        List<PrintServiceInfo> enabledServices = userState
@@ -799,7 +801,7 @@ public final class PrintManagerService extends SystemService { 
                    synchronized (mLock) {

                        if (hasPrintService(packageName)) {

                            UserState userState = getOrCreateUserStateLocked(getChangingUserId(),

                                    false);

                                    false, false /* enforceUserUnlockingOrUnlocked */);

                            userState.updateIfNeededLocked();

                        }

                    }
@@ -810,9 +812,14 @@ public final class PrintManagerService extends SystemService { 
            monitor.register(mContext, BackgroundThread.getHandler().getLooper(),

                    UserHandle.ALL, true);

        }



        private UserState getOrCreateUserStateLocked(int userId, boolean lowPriority) {

            if (!mUserManager.isUserUnlockingOrUnlocked(userId)) {

            return getOrCreateUserStateLocked(userId, lowPriority,

                    true /* enforceUserUnlockingOrUnlocked */);

        }



        private UserState getOrCreateUserStateLocked(int userId, boolean lowPriority,

                boolean enforceUserUnlockingOrUnlocked) {

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

                throw new IllegalStateException(

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

            }
@@ -840,7 +847,8 @@ public final class PrintManagerService extends SystemService { 


                    UserState userState;

                    synchronized (mLock) {

                        userState = getOrCreateUserStateLocked(userId, true);

                        userState = getOrCreateUserStateLocked(userId, true,

                                false /*enforceUserUnlockingOrUnlocked */);

                        userState.updateIfNeededLocked();

                    }

                    // This is the first time we switch to this user after boot, so