am 7f7d240b: Merge "Fix issue #17752399: Multiple apps broken by GET_TASKS... (90d557b7) · Commits · e / os / android_frameworks_base

api/current.txt

+1 −1

Original line number	Diff line number	Diff line
		@@ -67,7 +67,7 @@ package android {
		field public static final java.lang.String FORCE_BACK = "android.permission.FORCE_BACK";
		field public static final java.lang.String GET_ACCOUNTS = "android.permission.GET_ACCOUNTS";
		field public static final java.lang.String GET_PACKAGE_SIZE = "android.permission.GET_PACKAGE_SIZE";
		field public static final java.lang.String GET_TASKS = "android.permission.GET_TASKS";
		field public static final deprecated java.lang.String GET_TASKS = "android.permission.GET_TASKS";
		field public static final java.lang.String GET_TOP_ACTIVITY_INFO = "android.permission.GET_TOP_ACTIVITY_INFO";
		field public static final java.lang.String GLOBAL_SEARCH = "android.permission.GLOBAL_SEARCH";
		field public static final java.lang.String HARDWARE_TEST = "android.permission.HARDWARE_TEST";

core/java/android/app/ActivityManager.java

+1 −10

Original line number	Diff line number	Diff line
		@@ -931,7 +931,7 @@ public class ActivityManager {
		* purposes of control flow will be incorrect.</p>
		*
		* @deprecated As of {@link android.os.Build.VERSION_CODES#L}, this method is
		* no longer available to third party applications: as the introduction of
		* no longer available to third party applications: the introduction of
		* document-centric recents means
		* it can leak personal information to the caller. For backwards compatibility,
		* it will still return a small subset of its data: at least the caller's
		@@ -947,9 +947,6 @@ public class ActivityManager {
		*
		* @return Returns a list of RecentTaskInfo records describing each of
		* the recent tasks.
		*
		* @throws SecurityException Throws SecurityException if the caller does
		* not hold the {@link android.Manifest.permission#GET_TASKS} permission.
		*/
		@Deprecated
		public List<RecentTaskInfo> getRecentTasks(int maxNum, int flags)
		@@ -976,9 +973,6 @@ public class ActivityManager {
		* @return Returns a list of RecentTaskInfo records describing each of
		* the recent tasks.
		*
		* @throws SecurityException Throws SecurityException if the caller does
		* not hold the {@link android.Manifest.permission#GET_TASKS} or the
		* {@link android.Manifest.permission#INTERACT_ACROSS_USERS_FULL} permissions.
		* @hide
		*/
		public List<RecentTaskInfo> getRecentTasksForUser(int maxNum, int flags, int userId)
		@@ -1236,9 +1230,6 @@ public class ActivityManager {
		*
		* @return Returns a list of RunningTaskInfo records describing each of
		* the running tasks.
		*
		* @throws SecurityException Throws SecurityException if the caller does
		* not hold the {@link android.Manifest.permission#GET_TASKS} permission.
		*/
		@Deprecated
		public List<RunningTaskInfo> getRunningTasks(int maxNum)

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

+2 −0

Original line number	Diff line number	Diff line
		@@ -111,6 +111,8 @@ interface IPackageManager {

		int getFlagsForUid(int uid);

		boolean isUidPrivileged(int uid);

		String[] getAppOpPermissionPackages(String permissionName);

		ResolveInfo resolveIntent(in Intent intent, String resolvedType, int flags, int userId);

core/res/AndroidManifest.xml

+17 −2

Original line number	Diff line number	Diff line
		@@ -1398,9 +1398,24 @@
		android:description="@string/permgroupdesc_appInfo"
		android:priority="220" />

		<!-- @SystemApi Allows an application to get information about the currently
		or recently running tasks. -->
		<!-- @deprecated No longer enforced. -->
		<permission android:name="android.permission.GET_TASKS"
		android:permissionGroup="android.permission-group.APP_INFO"
		android:protectionLevel="normal"
		android:label="@string/permlab_getTasks"
		android:description="@string/permdesc_getTasks" />

		<!-- New version of GET_TASKS that apps can request, since GET_TASKS doesn't really
		give access to task information. We need this new one because there are
		many existing apps that use add libraries and such that have validation
		code to ensure the app has requested the GET_TASKS permission by seeing
		if it has been granted the permission... if it hasn't, it kills the app
		with a message about being upset. So we need to have it continue to look
		like the app is getting that permission, even though it will never be
		checked, and new privileged apps can now request this one for real access.
		@hide
		@SystemApi -->
		<permission android:name="android.permission.REAL_GET_TASKS"
		android:permissionGroup="android.permission-group.APP_INFO"
		android:protectionLevel="signature\|system"
		android:label="@string/permlab_getTasks"

core/tests/hosttests/test-apps/ExternalLocAllPermsTestApp/AndroidManifest.xml

+1 −1

Original line number	Diff line number	Diff line
		@@ -60,7 +60,7 @@
		<uses-permission android:name="android.permission.FORCE_BACK" />
		<uses-permission android:name="android.permission.GET_ACCOUNTS" />
		<uses-permission android:name="android.permission.GET_PACKAGE_SIZE" />
		<uses-permission android:name="android.permission.GET_TASKS" />
		<uses-permission android:name="android.permission.REAL_GET_TASKS" />
		<uses-permission android:name="android.permission.GLOBAL_SEARCH" />
		<uses-permission android:name="android.permission.HARDWARE_TEST" />
		<uses-permission android:name="android.permission.INJECT_EVENTS" />