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

Merge "Break out of DomainVerificationProxyV1 if info is null" into sc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2021-02-08 20:53:41 +00:00
committed by Android (Google) Code Review
parent 78fed176c8 779499c45c
commit b610667bfd
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
services/core/java/com/android/server/pm/verify/domain/proxy/DomainVerificationProxyV1.java
View File

@@ -153,18 +153,22 @@ public class DomainVerificationProxyV1 implements DomainVerificationProxy {
UUID domainSetId = pair.first;
String packageName = pair.second;
DomainVerificationInfo set;
DomainVerificationInfo info;
try {
set = mManager.getDomainVerificationInfo(packageName);
info = mManager.getDomainVerificationInfo(packageName);
} catch (PackageManager.NameNotFoundException ignored) {
return true;
}
if (!Objects.equals(domainSetId, set.getIdentifier())) {
if (info == null) {
return true;
}
Set<String> successfulDomains = new ArraySet<>(set.getHostToStateMap().keySet());
if (!Objects.equals(domainSetId, info.getIdentifier())) {
return true;
}
Set<String> successfulDomains = new ArraySet<>(info.getHostToStateMap().keySet());
successfulDomains.removeAll(response.failedDomains);
int callingUid = response.callingUid;