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

Merge "Skip domain verify broadcast if ActivityManager isn't ready" into sc-dev

Browse Source
This commit is contained in:
Winson Chiu
2021-03-24 19:15:15 +00:00
committed by Android (Google) Code Review
parent f803a76fc9 f39842dbc5
commit 635d5c7cf5
1 changed files with 27 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
services/core/java/com/android/server/pm/verify/domain/DomainVerificationService.java
View File

@@ -148,6 +148,8 @@ public class DomainVerificationService extends SystemService
@NonNull
private DomainVerificationProxy mProxy = new DomainVerificationProxyUnavailable();
private boolean mCanSendBroadcasts;
public DomainVerificationService(@NonNull Context context, @NonNull SystemConfig systemConfig,
@NonNull PlatformCompat platformCompat) {
super(context);
@@ -181,11 +183,18 @@ public class DomainVerificationService extends SystemService
@Override
public void onBootPhase(int phase) {
super.onBootPhase(phase);
if (phase != SystemService.PHASE_BOOT_COMPLETED || !hasRealVerifier()) {
if (!hasRealVerifier()) {
return;
}
verifyPackages(null, false);
switch (phase) {
case PHASE_ACTIVITY_MANAGER_READY:
mCanSendBroadcasts = true;
break;
case PHASE_BOOT_COMPLETED:
verifyPackages(null, false);
break;
}
}
@Override
@@ -858,7 +867,7 @@ public class DomainVerificationService extends SystemService
}
if (sendBroadcast) {
sendBroadcastForPackage(pkgName);
sendBroadcast(pkgName);
}
}
@@ -937,7 +946,7 @@ public class DomainVerificationService extends SystemService
}
if (sendBroadcast && hasAutoVerifyDomains) {
sendBroadcastForPackage(pkgName);
sendBroadcast(pkgName);
}
}
@@ -1098,8 +1107,19 @@ public class DomainVerificationService extends SystemService
return mCollector;
}
private void sendBroadcastForPackage(@NonNull String packageName) {
mProxy.sendBroadcastForPackages(Collections.singleton(packageName));
private void sendBroadcast(@NonNull String packageName) {
sendBroadcast(Collections.singleton(packageName));
}
private void sendBroadcast(@NonNull Set<String> packageNames) {
if (!mCanSendBroadcasts) {
// If the system cannot send broadcasts, it's probably still in boot, so dropping this
// request should be fine. The verification agent should re-scan packages once boot
// completes.
return;
}
mProxy.sendBroadcastForPackages(packageNames);
}
private boolean hasRealVerifier() {
@@ -1183,7 +1203,7 @@ public class DomainVerificationService extends SystemService
}
if (!packagesToBroadcast.isEmpty()) {
mProxy.sendBroadcastForPackages(packagesToBroadcast);
sendBroadcast(packagesToBroadcast);
}
}