Merge "First implementation of the grant/revoke UI" (3784a452) · Commits · e / os / android_frameworks_base

api/system-current.txt

+4 −0

Original line number	Diff line number	Diff line
		@@ -8143,8 +8143,10 @@ package android.content {
		field public static final java.lang.String ACTION_MAIN = "android.intent.action.MAIN";
		field public static final java.lang.String ACTION_MANAGED_PROFILE_ADDED = "android.intent.action.MANAGED_PROFILE_ADDED";
		field public static final java.lang.String ACTION_MANAGED_PROFILE_REMOVED = "android.intent.action.MANAGED_PROFILE_REMOVED";
		field public static final java.lang.String ACTION_MANAGE_APP_PERMISSIONS = "android.intent.action.MANAGE_APP_PERMISSIONS";
		field public static final java.lang.String ACTION_MANAGE_NETWORK_USAGE = "android.intent.action.MANAGE_NETWORK_USAGE";
		field public static final java.lang.String ACTION_MANAGE_PACKAGE_STORAGE = "android.intent.action.MANAGE_PACKAGE_STORAGE";
		field public static final java.lang.String ACTION_MANAGE_PERMISSION_APPS = "android.intent.action.MANAGE_PERMISSION_APPS";
		field public static final java.lang.String ACTION_MEDIA_BAD_REMOVAL = "android.intent.action.MEDIA_BAD_REMOVAL";
		field public static final java.lang.String ACTION_MEDIA_BUTTON = "android.intent.action.MEDIA_BUTTON";
		field public static final java.lang.String ACTION_MEDIA_CHECKING = "android.intent.action.MEDIA_CHECKING";
		@@ -8281,6 +8283,8 @@ package android.content {
		field public static final java.lang.String EXTRA_NOT_UNKNOWN_SOURCE = "android.intent.extra.NOT_UNKNOWN_SOURCE";
		field public static final java.lang.String EXTRA_ORIGINATING_URI = "android.intent.extra.ORIGINATING_URI";
		field public static final java.lang.String EXTRA_PACKAGES = "android.intent.extra.PACKAGES";
		field public static final java.lang.String EXTRA_PACKAGE_NAME = "android.intent.extra.PACKAGE_NAME";
		field public static final java.lang.String EXTRA_PERMISSION_NAME = "android.intent.extra.PERMISSION_NAME";
		field public static final java.lang.String EXTRA_PHONE_NUMBER = "android.intent.extra.PHONE_NUMBER";
		field public static final java.lang.String EXTRA_REFERRER = "android.intent.extra.REFERRER";
		field public static final java.lang.String EXTRA_REFERRER_NAME = "android.intent.extra.REFERRER_NAME";

core/java/android/content/Intent.java

+60 −0

Original line number	Diff line number	Diff line
		@@ -1502,6 +1502,66 @@ public class Intent implements Parcelable, Cloneable {
		*/
		public static final String METADATA_SETUP_VERSION = "android.SETUP_VERSION";

		/**
		* Activity action: Launch UI to manage the permissions of an app.
		* <p>
		* Input: {@link #EXTRA_PACKAGE_NAME} specifies the package whose permissions
		* will be managed by the launched UI.
		* </p>
		* <p>
		* Output: Nothing.
		* </p>
		*
		* @see #EXTRA_PACKAGE_NAME
		*
		* @hide
		*/
		@SystemApi
		@SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION)
		public static final String ACTION_MANAGE_APP_PERMISSIONS =
		"android.intent.action.MANAGE_APP_PERMISSIONS";

		/**
		* Intent extra: An app package name.
		* <p>
		* Type: String
		* </p>S
		*
		* @hide
		*/
		@SystemApi
		public static final String EXTRA_PACKAGE_NAME = "android.intent.extra.PACKAGE_NAME";

		/**
		* Activity action: Launch UI to manage which apps have a given permission.
		* <p>
		* Input: {@link #EXTRA_PERMISSION_NAME} specifies the permission access
		* to which will be managed by the launched UI.
		* </p>
		* <p>
		* Output: Nothing.
		* </p>
		*
		* @see #EXTRA_PERMISSION_NAME
		*
		* @hide
		*/
		@SystemApi
		@SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION)
		public static final String ACTION_MANAGE_PERMISSION_APPS =
		"android.intent.action.MANAGE_PERMISSION_APPS";

		/**
		* Intent extra: The name of a permission.
		* <p>
		* Type: String
		* </p>
		*
		* @hide
		*/
		@SystemApi
		public static final String EXTRA_PERMISSION_NAME = "android.intent.extra.PERMISSION_NAME";

		// ---------------------------------------------------------------------
		// ---------------------------------------------------------------------
		// Standard intent broadcast actions (see action variable).

core/java/android/content/pm/PackageParser.java

+2 −12

Original line number	Diff line number	Diff line
		@@ -376,16 +376,6 @@ public class PackageParser {
		return path.endsWith(".apk");
		}

		/*
		public static PackageInfo generatePackageInfo(PackageParser.Package p,
		int gids[], int flags, long firstInstallTime, long lastUpdateTime,
		HashSet<String> grantedPermissions) {
		PackageUserState state = new PackageUserState();
		return generatePackageInfo(p, gids, flags, firstInstallTime, lastUpdateTime,
		grantedPermissions, state, UserHandle.getCallingUserId());
		}
		*/

		/**
		* Generate and return the {@link PackageInfo} for a parsed package.
		*
		@@ -394,7 +384,7 @@ public class PackageParser {
		*/
		public static PackageInfo generatePackageInfo(PackageParser.Package p,
		int gids[], int flags, long firstInstallTime, long lastUpdateTime,
		ArraySet<String> grantedPermissions, PackageUserState state) {
		Set<String> grantedPermissions, PackageUserState state) {

		return generatePackageInfo(p, gids, flags, firstInstallTime, lastUpdateTime,
		grantedPermissions, state, UserHandle.getCallingUserId());
		@@ -574,7 +564,7 @@ public class PackageParser {
		for (int i=0; i<N; i++) {
		final String perm = p.requestedPermissions.get(i);
		pi.requestedPermissions[i] = perm;
		// The notion of requried permissions is deprecated but for compatibility.
		// The notion of required permissions is deprecated but for compatibility.
		pi.requestedPermissionsFlags[i] \|= PackageInfo.REQUESTED_PERMISSION_REQUIRED;
		if (grantedPermissions != null && grantedPermissions.contains(perm)) {
		pi.requestedPermissionsFlags[i] \|= PackageInfo.REQUESTED_PERMISSION_GRANTED;

core/java/android/preference/Preference.java

+4 −2

Original line number	Diff line number	Diff line
		@@ -706,9 +706,11 @@ public class Preference implements Comparable<Preference> {
		* @param iconResId The icon as a resource ID.
		*/
		public void setIcon(@DrawableRes int iconResId) {
		if (mIconResId != iconResId) {
		mIconResId = iconResId;
		setIcon(mContext.getDrawable(iconResId));
		}
		}

		/**
		* Returns the icon of this Preference.

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

+4 −5

Original line number	Diff line number	Diff line
		@@ -1951,15 +1951,14 @@ public class PackageManagerService extends IPackageManager.Stub {
		return null;
		}

		PermissionsState permissionsState = ps.getPermissionsState();
		final PermissionsState permissionsState = ps.getPermissionsState();

		final int[] gids = permissionsState.computeGids(userId);
		Set<String> permissions = permissionsState.getPermissions(userId);

		final Set<String> permissions = permissionsState.getPermissions(userId);
		final PackageUserState state = ps.readUserState(userId);

		return PackageParser.generatePackageInfo(p, gids, flags,
		ps.firstInstallTime, ps.lastUpdateTime, permissions,
		state, userId);
		ps.firstInstallTime, ps.lastUpdateTime, permissions, state, userId);
		}

		@Override