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

Commit 46513077 authored by Rhed Jao's avatar Rhed Jao
Browse files

Using internal user manager for the lock state checking 

For the methods that aren't necessary to enforce cross user permission
when calling into the `isUserUnlockingOrUnlocked` of UserManager, we
should use internal user manager instead.

Bug: 179699786
Test: atest PackageManagerTest
Change-Id: I93899292375b6ed1d8f7004e968449b2568947eb
parent 50d4ba03

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

+4 −2
Original line number Original line Diff line number Diff line
@@ -4217,8 +4217,9 @@ public class PackageManagerService extends IPackageManager.Stub 
                // aware/unaware components they want to see, so fall through and

                // aware/unaware components they want to see, so fall through and

                // give them what they want

                // give them what they want

            } else {

            } else {

                final UserManagerInternal umInternal = mInjector.getUserManagerInternal();

                // Caller expressed no opinion, so match based on user state

                // Caller expressed no opinion, so match based on user state

                if (mUserManager.isUserUnlockingOrUnlocked(userId)) {

                if (umInternal.isUserUnlockingOrUnlocked(userId)) {

                    flags |= PackageManager.MATCH_DIRECT_BOOT_AWARE | MATCH_DIRECT_BOOT_UNAWARE;

                    flags |= PackageManager.MATCH_DIRECT_BOOT_AWARE | MATCH_DIRECT_BOOT_UNAWARE;

                } else {

                } else {

                    flags |= PackageManager.MATCH_DIRECT_BOOT_AWARE;

                    flags |= PackageManager.MATCH_DIRECT_BOOT_AWARE;
@@ -15253,7 +15254,8 @@ public class PackageManagerService extends IPackageManager.Stub 
                    userId);

                    userId);

















            // Deliver BOOT_COMPLETED only if user is unlocked







            // Deliver BOOT_COMPLETED only if user is unlocked











            if (mUserManager.isUserUnlockingOrUnlocked(userId)) {







            final UserManagerInternal umInternal = mInjector.getUserManagerInternal();














            if (umInternal.isUserUnlockingOrUnlocked(userId)) {











                Intent bcIntent = new Intent(Intent.ACTION_BOOT_COMPLETED).setPackage(packageName);







                Intent bcIntent = new Intent(Intent.ACTION_BOOT_COMPLETED).setPackage(packageName);











                if (includeStopped) {







                if (includeStopped) {











                    bcIntent.addFlags(Intent.FLAG_INCLUDE_STOPPED_PACKAGES);







                    bcIntent.addFlags(Intent.FLAG_INCLUDE_STOPPED_PACKAGES);