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

Commit 6bbc61e7 authored by Hongming Jin's avatar Hongming Jin Committed by android-build-merger
Browse files

Merge "Enforce permission check before returning application info Test: atest... 

Merge "Enforce permission check before returning application info Test: atest CtsAppSecurityHostTestCases:ApplicationVisibilityTest Bug: 77821568" into pi-dev am: dbc60520
am: e2304c2e

Change-Id: I4a9f0c4fae6dc286fd671c007e3ff39ac357282f
parents 62786b44 e2304c2e

api/test-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -261,6 +261,7 @@ package android.content.pm { 
    method public abstract java.lang.String getDefaultBrowserPackageNameAsUser(int);

    method public abstract int getInstallReason(java.lang.String, android.os.UserHandle);

    method public abstract java.util.List<android.content.pm.PackageInfo> getInstalledPackagesAsUser(int, int);

    method public abstract java.util.List<android.content.pm.ApplicationInfo> getInstalledApplicationsAsUser(int, int);

    method public abstract java.lang.String[] getNamesForUids(int[]);

    method public abstract java.lang.String getPermissionControllerPackageName();

    method public abstract java.lang.String getServicesSystemSharedLibraryPackageName();

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

+1 −0
Original line number Diff line number Diff line
@@ -3798,6 +3798,7 @@ public abstract class PackageManager { 
     *         deleted with {@code DONT_DELETE_DATA} flag set).

     * @hide

     */

    @TestApi

    public abstract List<ApplicationInfo> getInstalledApplicationsAsUser(

            @ApplicationInfoFlags int flags, @UserIdInt int userId);

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

+7 −0
Original line number Diff line number Diff line
@@ -8031,6 +8031,13 @@ public class PackageManagerService extends IPackageManager.Stub 
        flags = updateFlagsForApplication(flags, userId, null);

        final boolean listUninstalled = (flags & MATCH_KNOWN_PACKAGES) != 0;













        mPermissionManager.enforceCrossUserPermission(













            callingUid,













            userId,













            false /* requireFullPermission */,













            false /* checkShell */,













            "get installed application info");



























        // writer















        synchronized (mPackages) {















            ArrayList<ApplicationInfo> list;