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

Commit 2b0e2cee authored by Winson's avatar Winson
Browse files

Rename get -> queryValidVerificationPackageNames 

Bug: 181100855

CTS-Coverage-Bug: 179382047

Test: none, API rename

Change-Id: I5b0deac6bb06b7c70fac8960c661d84309c98a91
parent 6a4df7f5

core/api/system-current.txt

+2 −2
Original line number Diff line number Diff line
@@ -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<android.content.pm.verify.domain.DomainOwner> getOwnersForDomain(@NonNull String);

    method @NonNull @RequiresPermission(android.Manifest.permission.DOMAIN_VERIFICATION_AGENT) public java.util.List<java.lang.String> getValidVerificationPackageNames();

    method @NonNull public java.util.List<android.content.pm.verify.domain.DomainOwner> 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<java.lang.String> 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<java.lang.String>, 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<java.lang.String>, boolean) throws android.content.pm.PackageManager.NameNotFoundException;

core/java/android/content/pm/verify/domain/DomainVerificationManager.java

+2 −2
Original line number Diff line number Diff line
@@ -203,9 +203,9 @@ public final class DomainVerificationManager { 
     */

    @NonNull

    @RequiresPermission(android.Manifest.permission.DOMAIN_VERIFICATION_AGENT)

    public List<String> getValidVerificationPackageNames() {

    public List<String> queryValidVerificationPackageNames() {

        try {

            return mDomainVerificationManager.getValidVerificationPackageNames();

            return mDomainVerificationManager.queryValidVerificationPackageNames();

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        }

core/java/android/content/pm/verify/domain/IDomainVerificationManager.aidl

+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ import java.util.List; 
 */

interface IDomainVerificationManager {



    List<String> getValidVerificationPackageNames();

    List<String> queryValidVerificationPackageNames();



    @nullable

    DomainVerificationInfo getDomainVerificationInfo(String packageName);

services/core/java/com/android/server/pm/verify/domain/DomainVerificationManagerStub.java

+2 −2
Original line number Diff line number Diff line
@@ -43,9 +43,9 @@ public class DomainVerificationManagerStub extends IDomainVerificationManager.St 


    @NonNull

    @Override

    public List<String> getValidVerificationPackageNames() {

    public List<String> queryValidVerificationPackageNames() {

        try {

            return mService.getValidVerificationPackageNames();

            return mService.queryValidVerificationPackageNames();

        } catch (Exception e) {

            throw rethrow(e);

        }

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

+1 −1
Original line number Diff line number Diff line
@@ -209,7 +209,7 @@ public class DomainVerificationService extends SystemService 
    }



    @NonNull

    public List<String> getValidVerificationPackageNames() {

    public List<String> queryValidVerificationPackageNames() {

        mEnforcer.assertApprovedVerifier(mConnection.getCallingUid(), mProxy);

        List<String> packageNames = new ArrayList<>();

        synchronized (mLock) {