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

Commit d897ab72 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

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

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13496770

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Icc9d229aa2b75e32454be226f77458f3ddb1ce9b
parents 88477aa9 b610667b

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

+8 −4
Original line number Diff line number Diff line
@@ -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;