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

Merge "Using internal user manager for the lock state checking" into sc-dev

Browse Source
This commit is contained in:
Rhed Jao
2021-04-01 04:15:56 +00:00
committed by Android (Google) Code Review
parent 1431702c5e 465130779c
commit e3f114e779
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;
@@ -15242,7 +15243,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);