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

Commit 32a09a1a authored by Alex Buynytskyy's avatar Alex Buynytskyy Committed by Android (Google) Code Review
Browse files

Merge "CLI API to enable testing of QAS." into main

parents 62568af6 e149f80b

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

+2 −0
Original line number Diff line number Diff line
@@ -304,6 +304,8 @@ interface IPackageManager { 


    boolean isPackageSuspendedForUser(String packageName, int userId);



    boolean isPackageQuarantinedForUser(String packageName, int userId);



    Bundle getSuspendedPackageAppExtras(String packageName, int userId);



    /**

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

+2 −0
Original line number Diff line number Diff line
@@ -487,6 +487,8 @@ public interface Computer extends PackageDataSnapshot { 


    boolean isPackageSuspendedForUser(@NonNull String packageName, @UserIdInt int userId);



    boolean isPackageQuarantinedForUser(@NonNull String packageName, @UserIdInt int userId);



    boolean isSuspendingAnyPackages(@NonNull String suspendingPackage, @UserIdInt int userId);



    @NonNull

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

+13 −3
Original line number Diff line number Diff line
@@ -4925,8 +4925,8 @@ public class ComputerEngine implements Computer { 
        }

    }



    @Override

    public boolean isPackageSuspendedForUser(@NonNull String packageName, int userId) {

    private PackageUserStateInternal getUserStageOrDefaultForUser(@NonNull String packageName,

            int userId) {

        final int callingUid = Binder.getCallingUid();

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

                false /* checkShell */, "isPackageSuspendedForUser for user " + userId);
@@ -4934,7 +4934,17 @@ public class ComputerEngine implements Computer { 
        if (ps == null || shouldFilterApplicationIncludingUninstalled(ps, callingUid, userId)) {

            throw new IllegalArgumentException("Unknown target package: " + packageName);

        }

        return ps.getUserStateOrDefault(userId).isSuspended();

        return ps.getUserStateOrDefault(userId);

    }



    @Override

    public boolean isPackageSuspendedForUser(@NonNull String packageName, int userId) {

        return getUserStageOrDefaultForUser(packageName, userId).isSuspended();

    }



    @Override

    public boolean isPackageQuarantinedForUser(@NonNull String packageName, @UserIdInt int userId) {

        return getUserStageOrDefaultForUser(packageName, userId).isQuarantined();

    }



    @Override

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

+7 −0
Original line number Diff line number Diff line
@@ -953,6 +953,13 @@ public abstract class IPackageManagerBase extends IPackageManager.Stub { 
        return snapshot().isPackageSuspendedForUser(packageName, userId);

    }



    @Override

    @Deprecated

    public final boolean isPackageQuarantinedForUser(@NonNull String packageName,

            @UserIdInt int userId) {

        return snapshot().isPackageQuarantinedForUser(packageName, userId);

    }



    @Override

    @Deprecated

    public final boolean isSafeMode() {

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

+1 −3
Original line number Diff line number Diff line
@@ -755,9 +755,7 @@ abstract class PackageManagerInternalBase extends PackageManagerInternal { 
    @Override

    public boolean isPackageQuarantined(@NonNull String packageName,

            @UserIdInt int userId) {

        final PackageStateInternal packageState = getPackageStateInternal(packageName);

        return (packageState == null) ? false

                : packageState.getUserStateOrDefault(userId).isQuarantined();

        return snapshot().isPackageQuarantinedForUser(packageName, userId);

    }



    @NonNull