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

Commit 583378df authored by Todd Kennedy's avatar Todd Kennedy
Browse files

Move providers to permission manager 

Bug: 135279435
Test: atest PermissionUpdateListenerTest
Test: atest android.content.pm.cts.PackageManagerTest
Test: atest android.permission2.cts.RestrictedPermissionsTest
Test: atest TeleServiceTests
Test: atest DataConnectionTest
Change-Id: Ife563589929b2662c60e1a0ab0ec8f6a2d7e4c12
parent 26f2c379

core/java/android/app/ApplicationPackageManager.java

+2 −2
Original line number Diff line number Diff line
@@ -2049,7 +2049,7 @@ public class ApplicationPackageManager extends PackageManager { 
    @Override

    public String getDefaultBrowserPackageNameAsUser(int userId) {

        try {

            return mPM.getDefaultBrowserPackageName(userId);

            return mPermissionManager.getDefaultBrowser(userId);

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        }
@@ -2058,7 +2058,7 @@ public class ApplicationPackageManager extends PackageManager { 
    @Override

    public boolean setDefaultBrowserPackageNameAsUser(String packageName, int userId) {

        try {

            return mPM.setDefaultBrowserPackageName(packageName, userId);

            return mPermissionManager.setDefaultBrowser(packageName, userId);

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        }

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

+0 −12
Original line number Diff line number Diff line
@@ -594,9 +594,6 @@ interface IPackageManager { 
    ParceledListSlice getIntentFilterVerifications(String packageName);

    ParceledListSlice getAllIntentFilters(String packageName);



    boolean setDefaultBrowserPackageName(String packageName, int userId);

    String getDefaultBrowserPackageName(int userId);



    VerifierDeviceIdentity getVerifierDeviceIdentity();



    boolean isFirstBoot();
@@ -629,15 +626,6 @@ interface IPackageManager { 
    boolean isPackageSignedByKeySet(String packageName, in KeySet ks);

    boolean isPackageSignedByKeySetExactly(String packageName, in KeySet ks);



    void grantDefaultPermissionsToEnabledCarrierApps(in String[] packageNames, int userId);

    void grantDefaultPermissionsToEnabledImsServices(in String[] packageNames, int userId);

    void grantDefaultPermissionsToEnabledTelephonyDataServices(

            in String[] packageNames, int userId);

    void revokeDefaultPermissionsFromDisabledTelephonyDataServices(

            in String[] packageNames, int userId);

    void grantDefaultPermissionsToActiveLuiApp(in String packageName, int userId);

    void revokeDefaultPermissionsFromLuiApps(in String[] packageNames, int userId);



    boolean isPermissionRevokedByPolicy(String permission, String packageName, int userId);



    @UnsupportedAppUsage

core/java/android/content/pm/PackageManagerInternal.java

+3 −171
Original line number Diff line number Diff line
@@ -83,139 +83,6 @@ public abstract class PackageManagerInternal { 
        void onPackageRemoved(@NonNull String packageName, int uid);

    }



    /**

     * Provider for package names.

     */

    public interface PackagesProvider {



        /**

         * Gets the packages for a given user.

         * @param userId The user id.

         * @return The package names.

         */

        public String[] getPackages(int userId);

    }



    /**

     * Provider for package names.

     */

    public interface SyncAdapterPackagesProvider {



        /**

         * Gets the sync adapter packages for given authority and user.

         * @param authority The authority.

         * @param userId The user id.

         * @return The package names.

         */

        public String[] getPackages(String authority, int userId);

    }



    /**

     * Provider for default browser

     */

    public interface DefaultBrowserProvider {



        /**

         * Get the package name of the default browser.

         *

         * @param userId the user id

         *

         * @return the package name of the default browser, or {@code null} if none

         */

        @Nullable

        String getDefaultBrowser(@UserIdInt int userId);



        /**

         * Set the package name of the default browser.

         *

         * @param packageName package name of the default browser, or {@code null} to remove

         * @param userId the user id

         *

         * @return whether the default browser was successfully set.

         */

        boolean setDefaultBrowser(@Nullable String packageName, @UserIdInt int userId);



        /**

         * Set the package name of the default browser asynchronously.

         *

         * @param packageName package name of the default browser, or {@code null} to remove

         * @param userId the user id

         */

        void setDefaultBrowserAsync(@Nullable String packageName, @UserIdInt int userId);

    }



    /**

     * Provider for default dialer

     */

    public interface DefaultDialerProvider {



        /**

         * Get the package name of the default dialer.

         *

         * @param userId the user id

         *

         * @return the package name of the default dialer, or {@code null} if none

         */

        @Nullable

        String getDefaultDialer(@UserIdInt int userId);

    }



    /**

     * Provider for default home

     */

    public interface DefaultHomeProvider {



        /**

         * Get the package name of the default home.

         *

         * @param userId the user id

         *

         * @return the package name of the default home, or {@code null} if none

         */

        @Nullable

        String getDefaultHome(@UserIdInt int userId);



        /**

         * Set the package name of the default home.

         *

         * @param packageName package name of the default home, or {@code null} to remove

         * @param userId the user id

         * @param callback the callback made after the default home as been updated

         */

        void setDefaultHomeAsync(@Nullable String packageName, @UserIdInt int userId,

                @NonNull Consumer<Boolean> callback);

    }



    /**

     * Sets the location provider packages provider.

     * @param provider The packages provider.

     */

    public abstract void setLocationPackagesProvider(PackagesProvider provider);



    /**

     * Set the location extra packages provider.

     * @param provider The packages provider.

     */

    public abstract  void setLocationExtraPackagesProvider(PackagesProvider provider);



    /**

     * Sets the voice interaction packages provider.

     * @param provider The packages provider.

     */

    public abstract void setVoiceInteractionPackagesProvider(PackagesProvider provider);



    /**

     * Sets the Use Open Wifi packages provider.

     * @param provider The packages provider.

     */

    public abstract void setUseOpenWifiAppPackagesProvider(PackagesProvider provider);



    /**

     * Sets the sync adapter packages provider.

     * @param provider The provider.

     */

    public abstract void setSyncAdapterPackagesprovider(SyncAdapterPackagesProvider provider);



    /**

     * Called when the package for the default SMS handler changed

     *
@@ -232,14 +99,6 @@ public abstract class PackageManagerInternal { 
     */

    public void onDefaultSimCallManagerAppChanged(String packageName, int userId) {}



    /**

     * Requests granting of the default permissions to the current default Use Open Wifi app.

     * @param packageName The default use open wifi package name.

     * @param userId The user for which to grant the permissions.

     */

    public abstract void grantDefaultPermissionsToDefaultUseOpenWifiApp(String packageName,

            int userId);



    /**

     * Sets a list of apps to keep in PM's internal data structures and as APKs even if no user has

     * currently installed it. The apps are not preloaded.
@@ -871,27 +730,6 @@ public abstract class PackageManagerInternal { 
    @Nullable

    public abstract String removeLegacyDefaultBrowserPackageName(int userId);



    /**

     * Sets the default browser provider.

     *

     * @param provider the provider

     */

    public abstract void setDefaultBrowserProvider(@NonNull DefaultBrowserProvider provider);



    /**

     * Sets the default dialer provider.

     *

     * @param provider the provider

     */

    public abstract void setDefaultDialerProvider(@NonNull DefaultDialerProvider provider);



    /**

     * Sets the default home provider.

     *

     * @param provider the provider

     */

    public abstract void setDefaultHomeProvider(@NonNull DefaultHomeProvider provider);



    /**

     * Returns {@code true} if given {@code packageName} is an apex package.

     */
@@ -909,15 +747,6 @@ public abstract class PackageManagerInternal { 
    public abstract void uninstallApex(String packageName, long versionCode, int userId,

            IntentSender intentSender);



    /**

     * Whether default permission grants have been performed for a user

     * since the device booted.

     *

     * @param userId The user id.

     * @return true if default permissions

     */

    public abstract boolean wereDefaultPermissionsGrantedSinceBoot(int userId);



    /**

     * Get fingerprint of build that updated the runtime permissions for a user.

     *
@@ -960,4 +789,7 @@ public abstract class PackageManagerInternal { 
     */

    public abstract boolean isCallerInstallerOfRecord(

            @NonNull PackageParser.Package pkg, int callingUid);



    /** Returns whether or not default runtime permissions are granted for the given user */

    public abstract boolean areDefaultRuntimePermissionsGranted(@UserIdInt int userId);

}

core/java/android/permission/IPermissionManager.aidl

+18 −0
Original line number Diff line number Diff line
@@ -70,4 +70,22 @@ interface IPermissionManager { 
    void revokeRuntimePermission(String packageName, String permName, int userId);



    void resetRuntimePermissions();



    boolean setDefaultBrowser(String packageName, int userId);



    String getDefaultBrowser(int userId);



    void grantDefaultPermissionsToEnabledCarrierApps(in String[] packageNames, int userId);



    void grantDefaultPermissionsToEnabledImsServices(in String[] packageNames, int userId);



    void grantDefaultPermissionsToEnabledTelephonyDataServices(

            in String[] packageNames, int userId);



    void revokeDefaultPermissionsFromDisabledTelephonyDataServices(

            in String[] packageNames, int userId);



    void grantDefaultPermissionsToActiveLuiApp(in String packageName, int userId);



    void revokeDefaultPermissionsFromLuiApps(in String[] packageNames, int userId);

}

services/core/java/com/android/server/LocationManagerService.java

+5 −5
Original line number Diff line number Diff line
@@ -42,7 +42,6 @@ import android.content.pm.ApplicationInfo; 
import android.content.pm.PackageInfo;

import android.content.pm.PackageManager;

import android.content.pm.PackageManager.NameNotFoundException;

import android.content.pm.PackageManagerInternal;

import android.content.pm.ResolveInfo;

import android.content.pm.Signature;

import android.content.res.Resources;
@@ -121,6 +120,7 @@ import com.android.server.location.LocationRequestStatistics.PackageStatistics; 
import com.android.server.location.MockProvider;

import com.android.server.location.PassiveProvider;

import com.android.server.location.RemoteListenerHelper;

import com.android.server.pm.permission.PermissionManagerServiceInternal;



import java.io.ByteArrayOutputStream;

import java.io.FileDescriptor;
@@ -282,12 +282,12 @@ public class LocationManagerService extends ILocationManager.Stub { 


        // Let the package manager query which are the default location

        // providers as they get certain permissions granted by default.

        PackageManagerInternal packageManagerInternal = LocalServices.getService(

                PackageManagerInternal.class);

        packageManagerInternal.setLocationPackagesProvider(

        PermissionManagerServiceInternal permissionManagerInternal = LocalServices.getService(

                PermissionManagerServiceInternal.class);

        permissionManagerInternal.setLocationPackagesProvider(

                userId -> mContext.getResources().getStringArray(

                        com.android.internal.R.array.config_locationProviderPackageNames));

        packageManagerInternal.setLocationExtraPackagesProvider(

        permissionManagerInternal.setLocationExtraPackagesProvider(

                userId -> mContext.getResources().getStringArray(

                      com.android.internal.R.array.config_locationExtraPackageNames));