Merge "AppOps: fix nested op tracking, new API to get apps using permissions." (2125dd57) · Commits · e / os / android_frameworks_base

api/current.txt

+2 −0

Original line number	Diff line number	Diff line
		@@ -6592,6 +6592,7 @@ package android.content.pm {
		method public abstract int[] getPackageGids(java.lang.String) throws android.content.pm.PackageManager.NameNotFoundException;
		method public abstract android.content.pm.PackageInfo getPackageInfo(java.lang.String, int) throws android.content.pm.PackageManager.NameNotFoundException;
		method public abstract java.lang.String[] getPackagesForUid(int);
		method public abstract java.util.List<android.content.pm.PackageInfo> getPackagesHoldingPermissions(java.lang.String[], int);
		method public abstract android.content.pm.PermissionGroupInfo getPermissionGroupInfo(java.lang.String, int) throws android.content.pm.PackageManager.NameNotFoundException;
		method public abstract android.content.pm.PermissionInfo getPermissionInfo(java.lang.String, int) throws android.content.pm.PackageManager.NameNotFoundException;
		method public abstract int getPreferredActivities(java.util.List<android.content.IntentFilter>, java.util.List<android.content.ComponentName>, java.lang.String);
		@@ -21689,6 +21690,7 @@ package android.test.mock {
		method public int[] getPackageGids(java.lang.String) throws android.content.pm.PackageManager.NameNotFoundException;
		method public android.content.pm.PackageInfo getPackageInfo(java.lang.String, int) throws android.content.pm.PackageManager.NameNotFoundException;
		method public java.lang.String[] getPackagesForUid(int);
		method public java.util.List<android.content.pm.PackageInfo> getPackagesHoldingPermissions(java.lang.String[], int);
		method public android.content.pm.PermissionGroupInfo getPermissionGroupInfo(java.lang.String, int) throws android.content.pm.PackageManager.NameNotFoundException;
		method public android.content.pm.PermissionInfo getPermissionInfo(java.lang.String, int) throws android.content.pm.PackageManager.NameNotFoundException;
		method public int getPreferredActivities(java.util.List<android.content.IntentFilter>, java.util.List<android.content.ComponentName>, java.lang.String);

core/java/android/app/ApplicationPackageManager.java

+22 −0

Original line number	Diff line number	Diff line
		@@ -442,6 +442,28 @@ final class ApplicationPackageManager extends PackageManager {
		}
		}

		@SuppressWarnings("unchecked")
		@Override
		public List<PackageInfo> getPackagesHoldingPermissions(
		String[] permissions, int flags) {
		final int userId = mContext.getUserId();
		try {
		final List<PackageInfo> packageInfos = new ArrayList<PackageInfo>();
		PackageInfo lastItem = null;
		ParceledListSlice<PackageInfo> slice;

		do {
		final String lastKey = lastItem != null ? lastItem.packageName : null;
		slice = mPM.getPackagesHoldingPermissions(permissions, flags, lastKey, userId);
		lastItem = slice.populateList(packageInfos, PackageInfo.CREATOR);
		} while (!slice.isLastSlice());

		return packageInfos;
		} catch (RemoteException e) {
		throw new RuntimeException("Package manager has died", e);
		}
		}

		@SuppressWarnings("unchecked")
		@Override
		public List<ApplicationInfo> getInstalledApplications(int flags) {

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

+9 −0

Original line number	Diff line number	Diff line
		@@ -129,6 +129,15 @@ interface IPackageManager {
		*/
		ParceledListSlice getInstalledPackages(int flags, in String lastRead, in int userId);

		/**
		* This implements getPackagesHoldingPermissions via a "last returned row"
		* mechanism that is not exposed in the API. This is to get around the IPC
		* limit that kicks in when flags are included that bloat up the data
		* returned.
		*/
		ParceledListSlice getPackagesHoldingPermissions(in String[] permissions,
		int flags, in String lastRead, int userId);

		/**
		* This implements getInstalledApplications via a "last returned row"
		* mechanism that is not exposed in the API. This is to get around the IPC

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

+35 −3

Original line number	Diff line number	Diff line
		@@ -1512,10 +1512,42 @@ public abstract class PackageManager {
		* @see #GET_SERVICES
		* @see #GET_SIGNATURES
		* @see #GET_UNINSTALLED_PACKAGES
		*
		*/
		public abstract List<PackageInfo> getInstalledPackages(int flags);

		/**
		* Return a List of all installed packages that are currently
		* holding any of the given permissions.
		*
		* @param flags Additional option flags. Use any combination of
		* {@link #GET_ACTIVITIES},
		* {@link #GET_GIDS},
		* {@link #GET_CONFIGURATIONS},
		* {@link #GET_INSTRUMENTATION},
		* {@link #GET_PERMISSIONS},
		* {@link #GET_PROVIDERS},
		* {@link #GET_RECEIVERS},
		* {@link #GET_SERVICES},
		* {@link #GET_SIGNATURES},
		* {@link #GET_UNINSTALLED_PACKAGES} to modify the data returned.
		*
		* @return Returns a List of PackageInfo objects, one for each installed
		* application that is holding any of the permissions that were provided.
		*
		* @see #GET_ACTIVITIES
		* @see #GET_GIDS
		* @see #GET_CONFIGURATIONS
		* @see #GET_INSTRUMENTATION
		* @see #GET_PERMISSIONS
		* @see #GET_PROVIDERS
		* @see #GET_RECEIVERS
		* @see #GET_SERVICES
		* @see #GET_SIGNATURES
		* @see #GET_UNINSTALLED_PACKAGES
		*/
		public abstract List<PackageInfo> getPackagesHoldingPermissions(
		String[] permissions, int flags);

		/**
		* Return a List of all packages that are installed on the device, for a specific user.
		* Requesting a list of installed packages for another user
		@@ -1749,7 +1781,7 @@ public abstract class PackageManager {
		* {@link #GET_META_DATA}, {@link #GET_SHARED_LIBRARY_FILES},
		* {@link #GET_UNINSTALLED_PACKAGES} to modify the data returned.
		*
		* @return A List of ApplicationInfo objects, one for each application that
		* @return Returns a List of ApplicationInfo objects, one for each application that
		* is installed on the device. In the unlikely case of there being
		* no installed applications, an empty list is returned.
		* If flag GET_UNINSTALLED_PACKAGES is set, a list of all

services/java/com/android/server/AppOpsService.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -233,6 +233,7 @@ public class AppOpsService extends IAppOpsService.Stub {
		+ " code " + code + " time=" + op.time + " duration=" + op.duration
		+ " nesting=" + op.nesting);
		}
		op.nesting = 0;
		} else {
		op.nesting--;
		}