Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Using internal user manager for the lock state checking

Browse Source 
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
This commit is contained in:
Rhed Jao
2021-03-31 16:55:01 +08:00
parent 50d4ba03b5
commit 465130779c
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/core/java/com/android/server/pm/PackageManagerService.java
View File

@@ -4217,8 +4217,9 @@ public class PackageManagerService extends IPackageManager.Stub
// aware/unaware components they want to see, so fall through and
// give them what they want
} else {
final UserManagerInternal umInternal = mInjector.getUserManagerInternal();
// 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;
} else {
flags |= PackageManager.MATCH_DIRECT_BOOT_AWARE;
@@ -15253,7 +15254,8 @@ public class PackageManagerService extends IPackageManager.Stub
userId);
// 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);
if (includeStopped) {
bcIntent.addFlags(Intent.FLAG_INCLUDE_STOPPED_PACKAGES);