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

Commit 75b6b1f2 authored by Rhed Jao's avatar Rhed Jao Committed by Android (Google) Code Review
Browse files

Merge "Rename api mayPackageQuery to canPackageQuery"

parents 3d54146c e2be64d5

core/api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -12551,6 +12551,7 @@ package android.content.pm { 
    method public abstract boolean addPermissionAsync(@NonNull android.content.pm.PermissionInfo);

    method @Deprecated public abstract void addPreferredActivity(@NonNull android.content.IntentFilter, int, @Nullable android.content.ComponentName[], @NonNull android.content.ComponentName);

    method @RequiresPermission(value="android.permission.WHITELIST_RESTRICTED_PERMISSIONS", conditional=true) public boolean addWhitelistedRestrictedPermission(@NonNull String, @NonNull String, int);

    method public boolean canPackageQuery(@NonNull String, @NonNull String) throws android.content.pm.PackageManager.NameNotFoundException;

    method public abstract boolean canRequestPackageInstalls();

    method public abstract String[] canonicalToCurrentPackageNames(@NonNull String[]);

    method @CheckResult public abstract int checkPermission(@NonNull String, @NonNull String);
@@ -12646,7 +12647,6 @@ package android.content.pm { 
    method public boolean isPackageSuspended();

    method @CheckResult public abstract boolean isPermissionRevokedByPolicy(@NonNull String, @NonNull String);

    method public abstract boolean isSafeMode();

    method public boolean mayPackageQuery(@NonNull String, @NonNull String) throws android.content.pm.PackageManager.NameNotFoundException;

    method @NonNull public java.util.List<android.content.pm.PackageManager.Property> queryActivityProperty(@NonNull String);

    method @NonNull public java.util.List<android.content.pm.PackageManager.Property> queryApplicationProperty(@NonNull String);

    method @NonNull public abstract java.util.List<android.content.pm.ResolveInfo> queryBroadcastReceivers(@NonNull android.content.Intent, int);

core/java/android/app/ApplicationPackageManager.java

+2 −2
Original line number Diff line number Diff line
@@ -3577,12 +3577,12 @@ public class ApplicationPackageManager extends PackageManager { 
    }



    @Override

    public boolean mayPackageQuery(@NonNull String sourcePackageName,

    public boolean canPackageQuery(@NonNull String sourcePackageName,

            @NonNull String targetPackageName) throws NameNotFoundException {

        Objects.requireNonNull(sourcePackageName);

        Objects.requireNonNull(targetPackageName);

        try {

            return mPM.mayPackageQuery(sourcePackageName, targetPackageName, getUserId());

            return mPM.canPackageQuery(sourcePackageName, targetPackageName, getUserId());

        } catch (ParcelableException e) {

            e.maybeRethrow(PackageManager.NameNotFoundException.class);

            throw new RuntimeException(e);

core/java/android/content/pm/IPackageManager.aidl

+1 −1
Original line number Diff line number Diff line
@@ -819,5 +819,5 @@ interface IPackageManager { 


    void setKeepUninstalledPackages(in List<String> packageList);



    boolean mayPackageQuery(String sourcePackageName, String targetPackageName, int userId);

    boolean canPackageQuery(String sourcePackageName, String targetPackageName, int userId);

}

core/java/android/content/pm/PackageManager.java

+2 −2
Original line number Diff line number Diff line
@@ -9357,10 +9357,10 @@ public abstract class PackageManager { 
     * system, or if the caller is not able to query for details about the source or

     * target package.

     */

    public boolean mayPackageQuery(@NonNull String sourcePackageName,

    public boolean canPackageQuery(@NonNull String sourcePackageName,

            @NonNull String targetPackageName) throws NameNotFoundException {

        throw new UnsupportedOperationException(

                "mayPackageQuery not implemented in subclass");

                "canPackageQuery not implemented in subclass");

    }



    /**

services/core/java/com/android/server/pm/PackageManagerService.java

+1 −1
Original line number Diff line number Diff line
@@ -21889,7 +21889,7 @@ public class PackageManagerService extends IPackageManager.Stub 
    }















    @Override













    public boolean mayPackageQuery(String sourcePackageName, String targetPackageName, int userId) {













    public boolean canPackageQuery(String sourcePackageName, String targetPackageName, int userId) {















        if (!mUserManager.exists(userId)) return false;















        final int callingUid = Binder.getCallingUid();















        enforceCrossUserPermission(callingUid, userId, false /*requireFullPermission*/,