Merge "Add aborted start result." into oc-dev (0259473b) · Commits · e / os / android_frameworks_base

core/java/android/app/ActivityManager.java

+7 −0

Original line number	Diff line number	Diff line
		@@ -359,6 +359,13 @@ public class ActivityManager {
		public static final int START_RETURN_LOCK_TASK_MODE_VIOLATION =
		FIRST_START_NON_FATAL_ERROR_CODE + 1;

		/**
		* Result for IActivityManaqer.startActivity: a new activity start was aborted. Never returned
		* externally.
		* @hide
		*/
		public static final int START_ABORTED = FIRST_START_NON_FATAL_ERROR_CODE + 2;

		/**
		* Flag for IActivityManaqer.startActivity: do special start mode where
		* a new activity is launched only if it is needed.

+5 −2

Original line number	Diff line number	Diff line
		@@ -17,6 +17,7 @@
		package com.android.server.am;

		import static android.app.Activity.RESULT_CANCELED;
		import static android.app.ActivityManager.START_ABORTED;
		import static android.app.ActivityManager.START_CANCELED;
		import static android.app.ActivityManager.START_CLASS_NOT_FOUND;
		import static android.app.ActivityManager.START_DELIVERED_TO_TOP;
		@@ -279,7 +280,9 @@ class ActivityStarter {
		// mLastStartActivityRecord[0] is set in the call to startActivity above.
		outActivity[0] = mLastStartActivityRecord[0];
		}
		return mLastStartActivityResult;

		// Aborted results are treated as successes externally, but we must track them internally.
		return mLastStartActivityResult != START_ABORTED ? mLastStartActivityResult : START_SUCCESS;
		}

		/** DO NOT call this method directly. Use {@link #startActivityLocked} instead. */
		@@ -465,7 +468,7 @@ class ActivityStarter {
		// We pretend to the caller that it was really started, but
		// they will just get a cancel result.
		ActivityOptions.abort(options);
		return START_SUCCESS;
		return START_ABORTED;
		}

		// If permissions need a review before any of the app components can run, we