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

Commit 14f8cd89 authored by Eugene Susla's avatar Eugene Susla Committed by android-build-merger
Browse files

Merge "MATCH_HIDDEN_UNTIL_INSTALLED_COMPONENTS when doing default permission grants" into qt-dev 

am: 44058c6e

Change-Id: I1a06f5defb5b292e9725276b3fd61834629ee26e
parents be0b66d7 44058c6e

services/core/java/com/android/server/pm/permission/DefaultPermissionGrantPolicy.java

+5 −3
Original line number Diff line number Diff line
@@ -108,7 +108,10 @@ public final class DefaultPermissionGrantPolicy { 


    @PackageManager.PackageInfoFlags

    private static final int DEFAULT_PACKAGE_INFO_QUERY_FLAGS =

            PackageManager.MATCH_UNINSTALLED_PACKAGES | PackageManager.GET_PERMISSIONS;

            PackageManager.MATCH_UNINSTALLED_PACKAGES

                    | PackageManager.MATCH_DISABLED_UNTIL_USED_COMPONENTS

                    | PackageManager.MATCH_HIDDEN_UNTIL_INSTALLED_COMPONENTS

                    | PackageManager.GET_PERMISSIONS;



    private static final String AUDIO_MIME_TYPE = "audio/mpeg";
@@ -1353,8 +1356,7 @@ public final class DefaultPermissionGrantPolicy { 
    }



    private PackageInfo getSystemPackageInfo(String pkg) {

        //TODO not MATCH_SYSTEM_ONLY?

        return getPackageInfo(pkg, PackageManager.MATCH_FACTORY_ONLY);

        return getPackageInfo(pkg, PackageManager.MATCH_SYSTEM_ONLY);

    }



    private PackageInfo getPackageInfo(String pkg) {