Merge "Make GET_TASKS signature|system." (5b8b9200) · Commits · e / os / android_frameworks_base

Android.mk

+0 −1

Original line number	Diff line number	Diff line
		@@ -78,7 +78,6 @@ LOCAL_SRC_FILES += \
		core/java/android/app/IStopUserCallback.aidl \
		core/java/android/app/task/ITaskCallback.aidl \
		core/java/android/app/task/ITaskService.aidl \
		core/java/android/app/IThumbnailReceiver.aidl \
		core/java/android/app/IThumbnailRetriever.aidl \
		core/java/android/app/ITransientNotification.aidl \
		core/java/android/app/IUiAutomationConnection.aidl \

CleanSpec.mk

+1 −0

Original line number	Diff line number	Diff line
		@@ -190,6 +190,7 @@ $(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framew
		$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework-base_intermediates/src/core/java/android/view/IMagnificationCallbacks*)
		$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework-base_intermediates/src/core/java/android/tv/)
		$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework-base_intermediates/src/media/java/android/media/)
		$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework-base_intermediates/src/core/java/android/app)

		# ************************************************
		# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST

core/java/android/app/ActivityManager.java

+6 −37

Original line number	Diff line number	Diff line
		@@ -784,42 +784,6 @@ public class ActivityManager {
		}
		}

		/**
		* Return a list of the tasks that are currently running, with
		* the most recent being first and older ones after in order. Note that
		* "running" does not mean any of the task's code is currently loaded or
		* activity -- the task may have been frozen by the system, so that it
		* can be restarted in its previous state when next brought to the
		* foreground.
		*
		* @param maxNum The maximum number of entries to return in the list. The
		* actual number returned may be smaller, depending on how many tasks the
		* user has started.
		*
		* @param flags Optional flags
		* @param receiver Optional receiver for delayed thumbnails
		*
		* @return Returns a list of RunningTaskInfo records describing each of
		* the running tasks.
		*
		* Some thumbnails may not be available at the time of this call. The optional
		* receiver may be used to receive those thumbnails.
		*
		* @throws SecurityException Throws SecurityException if the caller does
		* not hold the {@link android.Manifest.permission#GET_TASKS} permission.
		*
		* @hide
		*/
		public List<RunningTaskInfo> getRunningTasks(int maxNum, int flags, IThumbnailReceiver receiver)
		throws SecurityException {
		try {
		return ActivityManagerNative.getDefault().getTasks(maxNum, flags, receiver);
		} catch (RemoteException e) {
		// System dead, we will be dead too soon!
		return null;
		}
		}

		/**
		* Return a list of the tasks that are currently running, with
		* the most recent being first and older ones after in order. Note that
		@@ -849,7 +813,12 @@ public class ActivityManager {
		*/
		public List<RunningTaskInfo> getRunningTasks(int maxNum)
		throws SecurityException {
		return getRunningTasks(maxNum, 0, null);
		try {
		return ActivityManagerNative.getDefault().getTasks(maxNum, 0);
		} catch (RemoteException e) {
		// System dead, we will be dead too soon!
		return null;
		}
		}

		/**

core/java/android/app/ActivityManagerNative.java

+2 −38

Original line number	Diff line number	Diff line
		@@ -509,11 +509,7 @@ public abstract class ActivityManagerNative extends Binder implements IActivityM
		data.enforceInterface(IActivityManager.descriptor);
		int maxNum = data.readInt();
		int fl = data.readInt();
		IBinder receiverBinder = data.readStrongBinder();
		IThumbnailReceiver receiver = receiverBinder != null
		? IThumbnailReceiver.Stub.asInterface(receiverBinder)
		: null;
		List<ActivityManager.RunningTaskInfo> list = getTasks(maxNum, fl, receiver);
		List<ActivityManager.RunningTaskInfo> list = getTasks(maxNum, fl);
		reply.writeNoException();
		int N = list != null ? list.size() : -1;
		reply.writeInt(N);
		@@ -712,17 +708,6 @@ public abstract class ActivityManagerNative extends Binder implements IActivityM
		return true;
		}

		case REPORT_THUMBNAIL_TRANSACTION: {
		data.enforceInterface(IActivityManager.descriptor);
		IBinder token = data.readStrongBinder();
		Bitmap thumbnail = data.readInt() != 0
		? Bitmap.CREATOR.createFromParcel(data) : null;
		CharSequence description = TextUtils.CHAR_SEQUENCE_CREATOR.createFromParcel(data);
		reportThumbnail(token, thumbnail, description);
		reply.writeNoException();
		return true;
		}

		case GET_CONTENT_PROVIDER_TRANSACTION: {
		data.enforceInterface(IActivityManager.descriptor);
		IBinder b = data.readStrongBinder();
		@@ -2678,14 +2663,12 @@ class ActivityManagerProxy implements IActivityManager
		reply.recycle();
		return res;
		}
		public List getTasks(int maxNum, int flags,
		IThumbnailReceiver receiver) throws RemoteException {
		public List getTasks(int maxNum, int flags) throws RemoteException {
		Parcel data = Parcel.obtain();
		Parcel reply = Parcel.obtain();
		data.writeInterfaceToken(IActivityManager.descriptor);
		data.writeInt(maxNum);
		data.writeInt(flags);
		data.writeStrongBinder(receiver != null ? receiver.asBinder() : null);
		mRemote.transact(GET_TASKS_TRANSACTION, data, reply, 0);
		reply.readException();
		ArrayList list = null;
		@@ -2964,25 +2947,6 @@ class ActivityManagerProxy implements IActivityManager
		reply.recycle();
		return res;
		}
		public void reportThumbnail(IBinder token,
		Bitmap thumbnail, CharSequence description) throws RemoteException
		{
		Parcel data = Parcel.obtain();
		Parcel reply = Parcel.obtain();
		data.writeInterfaceToken(IActivityManager.descriptor);
		data.writeStrongBinder(token);
		if (thumbnail != null) {
		data.writeInt(1);
		thumbnail.writeToParcel(data, 0);
		} else {
		data.writeInt(0);
		}
		TextUtils.writeToParcel(description, data, 0);
		mRemote.transact(REPORT_THUMBNAIL_TRANSACTION, data, reply, IBinder.FLAG_ONEWAY);
		reply.readException();
		data.recycle();
		reply.recycle();
		}
		public ContentProviderHolder getContentProvider(IApplicationThread caller,
		String name, int userId, boolean stable) throws RemoteException {
		Parcel data = Parcel.obtain();

core/java/android/app/ActivityThread.java

+1 −33

Original line number	Diff line number	Diff line
		@@ -821,10 +821,6 @@ public final class ActivityThread {
		sendMessage(H.SUICIDE, null);
		}

		public void requestThumbnail(IBinder token) {
		sendMessage(H.REQUEST_THUMBNAIL, token);
		}

		public void scheduleConfigurationChanged(Configuration config) {
		updatePendingConfiguration(config);
		sendMessage(H.CONFIGURATION_CHANGED, config);
		@@ -1168,7 +1164,7 @@ public final class ActivityThread {
		public static final int CREATE_SERVICE = 114;
		public static final int SERVICE_ARGS = 115;
		public static final int STOP_SERVICE = 116;
		public static final int REQUEST_THUMBNAIL = 117;

		public static final int CONFIGURATION_CHANGED = 118;
		public static final int CLEAN_UP_CONTEXT = 119;
		public static final int GC_WHEN_IDLE = 120;
		@@ -1218,7 +1214,6 @@ public final class ActivityThread {
		case CREATE_SERVICE: return "CREATE_SERVICE";
		case SERVICE_ARGS: return "SERVICE_ARGS";
		case STOP_SERVICE: return "STOP_SERVICE";
		case REQUEST_THUMBNAIL: return "REQUEST_THUMBNAIL";
		case CONFIGURATION_CHANGED: return "CONFIGURATION_CHANGED";
		case CLEAN_UP_CONTEXT: return "CLEAN_UP_CONTEXT";
		case GC_WHEN_IDLE: return "GC_WHEN_IDLE";
		@@ -1367,11 +1362,6 @@ public final class ActivityThread {
		maybeSnapshot();
		Trace.traceEnd(Trace.TRACE_TAG_ACTIVITY_MANAGER);
		break;
		case REQUEST_THUMBNAIL:
		Trace.traceBegin(Trace.TRACE_TAG_ACTIVITY_MANAGER, "requestThumbnail");
		handleRequestThumbnail((IBinder)msg.obj);
		Trace.traceEnd(Trace.TRACE_TAG_ACTIVITY_MANAGER);
		break;
		case CONFIGURATION_CHANGED:
		Trace.traceBegin(Trace.TRACE_TAG_ACTIVITY_MANAGER, "configChanged");
		mCurDefaultDisplayDpi = ((Configuration)msg.obj).densityDpi;
		@@ -3817,28 +3807,6 @@ public final class ActivityThread {
		handleLaunchActivity(r, currentIntent);
		}

		private void handleRequestThumbnail(IBinder token) {
		ActivityClientRecord r = mActivities.get(token);
		Bitmap thumbnail = createThumbnailBitmap(r);
		CharSequence description = null;
		try {
		description = r.activity.onCreateDescription();
		} catch (Exception e) {
		if (!mInstrumentation.onException(r.activity, e)) {
		throw new RuntimeException(
		"Unable to create description of activity "
		+ r.intent.getComponent().toShortString()
		+ ": " + e.toString(), e);
		}
		}
		//System.out.println("Reporting top thumbnail " + thumbnail);
		try {
		ActivityManagerNative.getDefault().reportThumbnail(
		token, thumbnail, description);
		} catch (RemoteException ex) {
		}
		}

		ArrayList<ComponentCallbacks2> collectComponentCallbacks(
		boolean allActivities, Configuration newConfig) {
		ArrayList<ComponentCallbacks2> callbacks