From 2b0e2cee2e1dfc8a9d49b16b3f64493da029ca10 Mon Sep 17 00:00:00 2001 From: Winson Date: Wed, 24 Feb 2021 15:28:12 -0800 Subject: [PATCH] Rename get -> queryValidVerificationPackageNames Bug: 181100855 CTS-Coverage-Bug: 179382047 Test: none, API rename Change-Id: I5b0deac6bb06b7c70fac8960c661d84309c98a91 --- core/api/system-current.txt | 4 ++-- .../content/pm/verify/domain/DomainVerificationManager.java | 4 ++-- .../content/pm/verify/domain/IDomainVerificationManager.aidl | 2 +- .../pm/verify/domain/DomainVerificationManagerStub.java | 4 ++-- .../server/pm/verify/domain/DomainVerificationService.java | 2 +- .../pm/test/verify/domain/DomainVerificationEnforcerTest.kt | 4 ++-- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/core/api/system-current.txt b/core/api/system-current.txt index de9bc68945c7f..c85f566344258 100644 --- a/core/api/system-current.txt +++ b/core/api/system-current.txt @@ -2772,10 +2772,10 @@ package android.content.pm.verify.domain { public final class DomainVerificationManager { method @Nullable @RequiresPermission(anyOf={android.Manifest.permission.DOMAIN_VERIFICATION_AGENT, android.Manifest.permission.UPDATE_DOMAIN_VERIFICATION_USER_SELECTION}) public android.content.pm.verify.domain.DomainVerificationInfo getDomainVerificationInfo(@NonNull String) throws android.content.pm.PackageManager.NameNotFoundException; method @Nullable @RequiresPermission(android.Manifest.permission.UPDATE_DOMAIN_VERIFICATION_USER_SELECTION) public android.content.pm.verify.domain.DomainVerificationUserSelection getDomainVerificationUserSelection(@NonNull String) throws android.content.pm.PackageManager.NameNotFoundException; - method @NonNull @RequiresPermission(android.Manifest.permission.UPDATE_DOMAIN_VERIFICATION_USER_SELECTION) public java.util.List getOwnersForDomain(@NonNull String); - method @NonNull @RequiresPermission(android.Manifest.permission.DOMAIN_VERIFICATION_AGENT) public java.util.List getValidVerificationPackageNames(); + method @NonNull public java.util.List getOwnersForDomain(@NonNull String); method public static boolean isStateModifiable(int); method public static boolean isStateVerified(int); + method @NonNull @RequiresPermission(android.Manifest.permission.DOMAIN_VERIFICATION_AGENT) public java.util.List queryValidVerificationPackageNames(); method @RequiresPermission(android.Manifest.permission.UPDATE_DOMAIN_VERIFICATION_USER_SELECTION) public void setDomainVerificationLinkHandlingAllowed(@NonNull String, boolean) throws android.content.pm.PackageManager.NameNotFoundException; method @RequiresPermission(android.Manifest.permission.DOMAIN_VERIFICATION_AGENT) public void setDomainVerificationStatus(@NonNull java.util.UUID, @NonNull java.util.Set, int) throws android.content.pm.PackageManager.NameNotFoundException; method @RequiresPermission(android.Manifest.permission.UPDATE_DOMAIN_VERIFICATION_USER_SELECTION) public void setDomainVerificationUserSelection(@NonNull java.util.UUID, @NonNull java.util.Set, boolean) throws android.content.pm.PackageManager.NameNotFoundException; diff --git a/core/java/android/content/pm/verify/domain/DomainVerificationManager.java b/core/java/android/content/pm/verify/domain/DomainVerificationManager.java index c23d5a4593d81..29559b964b499 100644 --- a/core/java/android/content/pm/verify/domain/DomainVerificationManager.java +++ b/core/java/android/content/pm/verify/domain/DomainVerificationManager.java @@ -203,9 +203,9 @@ public final class DomainVerificationManager { */ @NonNull @RequiresPermission(android.Manifest.permission.DOMAIN_VERIFICATION_AGENT) - public List getValidVerificationPackageNames() { + public List queryValidVerificationPackageNames() { try { - return mDomainVerificationManager.getValidVerificationPackageNames(); + return mDomainVerificationManager.queryValidVerificationPackageNames(); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); } diff --git a/core/java/android/content/pm/verify/domain/IDomainVerificationManager.aidl b/core/java/android/content/pm/verify/domain/IDomainVerificationManager.aidl index 701af320fb019..85ad47cd3509e 100644 --- a/core/java/android/content/pm/verify/domain/IDomainVerificationManager.aidl +++ b/core/java/android/content/pm/verify/domain/IDomainVerificationManager.aidl @@ -28,7 +28,7 @@ import java.util.List; */ interface IDomainVerificationManager { - List getValidVerificationPackageNames(); + List queryValidVerificationPackageNames(); @nullable DomainVerificationInfo getDomainVerificationInfo(String packageName); diff --git a/services/core/java/com/android/server/pm/verify/domain/DomainVerificationManagerStub.java b/services/core/java/com/android/server/pm/verify/domain/DomainVerificationManagerStub.java index d0f6056bff744..d89fe68c05443 100644 --- a/services/core/java/com/android/server/pm/verify/domain/DomainVerificationManagerStub.java +++ b/services/core/java/com/android/server/pm/verify/domain/DomainVerificationManagerStub.java @@ -43,9 +43,9 @@ public class DomainVerificationManagerStub extends IDomainVerificationManager.St @NonNull @Override - public List getValidVerificationPackageNames() { + public List queryValidVerificationPackageNames() { try { - return mService.getValidVerificationPackageNames(); + return mService.queryValidVerificationPackageNames(); } catch (Exception e) { throw rethrow(e); } diff --git a/services/core/java/com/android/server/pm/verify/domain/DomainVerificationService.java b/services/core/java/com/android/server/pm/verify/domain/DomainVerificationService.java index efd6ae26a0657..f5fc58ea83297 100644 --- a/services/core/java/com/android/server/pm/verify/domain/DomainVerificationService.java +++ b/services/core/java/com/android/server/pm/verify/domain/DomainVerificationService.java @@ -209,7 +209,7 @@ public class DomainVerificationService extends SystemService } @NonNull - public List getValidVerificationPackageNames() { + public List queryValidVerificationPackageNames() { mEnforcer.assertApprovedVerifier(mConnection.getCallingUid(), mProxy); List packageNames = new ArrayList<>(); synchronized (mLock) { diff --git a/services/tests/PackageManagerServiceTests/unit/src/com/android/server/pm/test/verify/domain/DomainVerificationEnforcerTest.kt b/services/tests/PackageManagerServiceTests/unit/src/com/android/server/pm/test/verify/domain/DomainVerificationEnforcerTest.kt index ed1b571ced634..fa700b9a7a207 100644 --- a/services/tests/PackageManagerServiceTests/unit/src/com/android/server/pm/test/verify/domain/DomainVerificationEnforcerTest.kt +++ b/services/tests/PackageManagerServiceTests/unit/src/com/android/server/pm/test/verify/domain/DomainVerificationEnforcerTest.kt @@ -187,8 +187,8 @@ class DomainVerificationEnforcerTest { service(Type.INTERNAL, "clearUserSelections") { clearUserSelections(listOf(it.targetPackageName), it.userId) }, - service(Type.VERIFIER, "getPackageNames") { - validVerificationPackageNames + service(Type.VERIFIER, "queryValidPackageNames") { + queryValidVerificationPackageNames() }, service(Type.QUERENT, "getInfo") { getDomainVerificationInfo(it.targetPackageName)