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

Commit 1d29b4af authored by Todd Kennedy's avatar Todd Kennedy
Browse files

Move permission info queries 

Now begins the parade of methods that can be migrated to the
permission manager service and be removed from the package
manager service.

We will still need to maintain some sub-set of APIs in the
package manager service due to unsupported app usage. When
we finally no longer support these AIDL methods, they can
be removed from package manager service.

Bug: 135279435
Test: Manual. Builds and runs
Change-Id: If12609ffdaeb75445d3ec9bcc7f946b8829ba769
parent 8f135982

core/java/android/app/ApplicationPackageManager.java

+40 −41
Original line number Diff line number Diff line
@@ -321,30 +321,60 @@ public class ApplicationPackageManager extends PackageManager { 
    }



    @Override

    public PermissionInfo getPermissionInfo(String name, int flags)

    @SuppressWarnings("unchecked")

    public List<PermissionGroupInfo> getAllPermissionGroups(int flags) {

        try {

            final ParceledListSlice<PermissionGroupInfo> parceledList =

                    mPermissionManager.getAllPermissionGroups(flags);

            if (parceledList == null) {

                return Collections.emptyList();

            }

            return parceledList.getList();

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        }

    }



    @Override

    public PermissionGroupInfo getPermissionGroupInfo(String groupName, int flags)

            throws NameNotFoundException {

        try {

            PermissionInfo pi = mPM.getPermissionInfo(name,

                    mContext.getOpPackageName(), flags);

            final PermissionGroupInfo pgi =

                    mPermissionManager.getPermissionGroupInfo(groupName, flags);

            if (pgi != null) {

                return pgi;

            }

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        }

        throw new NameNotFoundException(groupName);

    }



    @Override

    public PermissionInfo getPermissionInfo(String permName, int flags)

            throws NameNotFoundException {

        try {

            final String packageName = mContext.getOpPackageName();

            final PermissionInfo pi =

                    mPermissionManager.getPermissionInfo(permName, packageName, flags);

            if (pi != null) {

                return pi;

            }

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        }



        throw new NameNotFoundException(name);

        throw new NameNotFoundException(permName);

    }



    @Override

    @SuppressWarnings("unchecked")

    public List<PermissionInfo> queryPermissionsByGroup(String group, int flags)

    public List<PermissionInfo> queryPermissionsByGroup(String groupName, int flags)

            throws NameNotFoundException {

        try {

            ParceledListSlice<PermissionInfo> parceledList =

                    mPM.queryPermissionsByGroup(group, flags);

            final ParceledListSlice<PermissionInfo> parceledList =

                    mPermissionManager.queryPermissionsByGroup(groupName, flags);

            if (parceledList != null) {

                List<PermissionInfo> pi = parceledList.getList();

                final List<PermissionInfo> pi = parceledList.getList();

                if (pi != null) {

                    return pi;

                }
@@ -352,8 +382,7 @@ public class ApplicationPackageManager extends PackageManager { 
        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        }



        throw new NameNotFoundException(group);

        throw new NameNotFoundException(groupName);

    }



    @Override
@@ -368,36 +397,6 @@ public class ApplicationPackageManager extends PackageManager { 
                com.android.internal.R.bool.config_wirelessConsentRequired);

    }



    @Override

    public PermissionGroupInfo getPermissionGroupInfo(String name,

            int flags) throws NameNotFoundException {

        try {

            PermissionGroupInfo pgi = mPM.getPermissionGroupInfo(name, flags);

            if (pgi != null) {

                return pgi;

            }

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        }



        throw new NameNotFoundException(name);

    }



    @Override

    @SuppressWarnings("unchecked")

    public List<PermissionGroupInfo> getAllPermissionGroups(int flags) {

        try {

            ParceledListSlice<PermissionGroupInfo> parceledList =

                    mPM.getAllPermissionGroups(flags);

            if (parceledList == null) {

                return Collections.emptyList();

            }

            return parceledList.getList();

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        }

    }



    @Override

    public ApplicationInfo getApplicationInfo(String packageName, int flags)

            throws NameNotFoundException {

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

+3 −9
Original line number Diff line number Diff line
@@ -78,15 +78,6 @@ interface IPackageManager { 
    @UnsupportedAppUsage

    String[] canonicalToCurrentPackageNames(in String[] names);



    PermissionInfo getPermissionInfo(String name, String packageName, int flags);



    ParceledListSlice queryPermissionsByGroup(String group, int flags);



    @UnsupportedAppUsage

    PermissionGroupInfo getPermissionGroupInfo(String name, int flags);



    ParceledListSlice getAllPermissionGroups(int flags);



    @UnsupportedAppUsage

    ApplicationInfo getApplicationInfo(String packageName, int flags ,int userId);
@@ -777,4 +768,7 @@ interface IPackageManager { 
    //------------------------------------------------------------------------

    @UnsupportedAppUsage

    String[] getAppOpPermissionPackages(String permissionName);



    @UnsupportedAppUsage

    PermissionGroupInfo getPermissionGroupInfo(String name, int flags);

}

core/java/android/permission/IPermissionManager.aidl

+12 −0
Original line number Diff line number Diff line
@@ -16,6 +16,10 @@ 


package android.permission;



import android.content.pm.ParceledListSlice;

import android.content.pm.PermissionGroupInfo;

import android.content.pm.PermissionInfo;



/**

 * Interface to communicate directly with the permission manager service.

 * @see PermissionManager
@@ -23,4 +27,12 @@ package android.permission; 
 */

interface IPermissionManager {

    String[] getAppOpPermissionPackages(String permName);



    ParceledListSlice getAllPermissionGroups(int flags);



    PermissionGroupInfo getPermissionGroupInfo(String groupName, int flags);



    PermissionInfo getPermissionInfo(String permName, String packageName, int flags);



    ParceledListSlice queryPermissionsByGroup(String groupName, int flags);

}

services/core/java/com/android/server/am/BroadcastQueue.java

+2 −2
Original line number Diff line number Diff line
@@ -30,7 +30,6 @@ import android.content.IIntentSender; 
import android.content.Intent;

import android.content.IntentSender;

import android.content.pm.ActivityInfo;

import android.content.pm.IPackageManager;

import android.content.pm.PackageManager;

import android.content.pm.PermissionInfo;

import android.content.pm.ResolveInfo;
@@ -44,6 +43,7 @@ import android.os.RemoteException; 
import android.os.SystemClock;

import android.os.Trace;

import android.os.UserHandle;

import android.permission.IPermissionManager;

import android.util.EventLog;

import android.util.Slog;

import android.util.SparseIntArray;
@@ -921,7 +921,7 @@ public final class BroadcastQueue { 
        if (perms == null) {

            return false;

        }

        IPackageManager pm = AppGlobals.getPackageManager();

        IPermissionManager pm = AppGlobals.getPermissionManager();

        for (int i = perms.length-1; i >= 0; i--) {

            try {

                PermissionInfo pi = pm.getPermissionInfo(perms[i], "android", 0);

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

+11 −25
Original line number Diff line number Diff line
@@ -4630,30 +4630,15 @@ public class PackageManagerService extends IPackageManager.Stub 
        return null;

    }













    @Override













    public PermissionInfo getPermissionInfo(String name, String packageName, int flags) {













        return mPermissionManager.getPermissionInfo(name, packageName, flags, getCallingUid());













    }

























    @Override













    public @Nullable ParceledListSlice<PermissionInfo> queryPermissionsByGroup(String groupName,













            int flags) {













        final List<PermissionInfo> permissionList =













                mPermissionManager.getPermissionInfoByGroup(groupName, flags, getCallingUid());













        return (permissionList == null) ? null : new ParceledListSlice<>(permissionList);













    }

























    // NOTE: Can't remove due to unsupported app usage















    @Override















    public PermissionGroupInfo getPermissionGroupInfo(String groupName, int flags) {













        return mPermissionManager.getPermissionGroupInfo(groupName, flags, getCallingUid());













    }

























    @Override













    public @NonNull ParceledListSlice<PermissionGroupInfo> getAllPermissionGroups(int flags) {













        final List<PermissionGroupInfo> permissionList =













                mPermissionManager.getAllPermissionGroups(flags, getCallingUid());













        return (permissionList == null)













                ? ParceledListSlice.emptyList() : new ParceledListSlice<>(permissionList);













        try {













            // Because this is accessed via the package manager service AIDL,













            // go through the permission manager service AIDL













            return mPermissionManagerService.getPermissionGroupInfo(groupName, flags);













        } catch (RemoteException ignore) { }













        return null;















    }





























    @GuardedBy("mPackages")










@@ -6571,11 +6556,12 @@ public class PackageManagerService extends IPackageManager.Stub













        return false;















    }



























    // NOTE: Can't remove due to unsupported app usage















    @Override















    public String[] getAppOpPermissionPackages(String permName) {















        try {













            // NOTE: Because this is defined in the package manager service AIDL, we want













            // ensure we also go through the permission manager service AIDL













            // Because this is accessed via the package manager service AIDL,













            // go through the permission manager service AIDL















            return mPermissionManagerService.getAppOpPermissionPackages(permName);















        } catch (RemoteException ignore) { }















        return null;










@@ -21758,7 +21744,7 @@ public class PackageManagerService extends IPackageManager.Stub













    public void onShellCommand(FileDescriptor in, FileDescriptor out,















            FileDescriptor err, String[] args, ShellCallback callback,















            ResultReceiver resultReceiver) {













        (new PackageManagerShellCommand(this)).exec(













        (new PackageManagerShellCommand(this, mPermissionManagerService)).exec(















                this, in, out, err, args, callback, resultReceiver);















    }