diff options
Diffstat (limited to 'services/core/java/com/android/server/am/ActivityStarter.java')
| -rw-r--r-- | services/core/java/com/android/server/am/ActivityStarter.java | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/services/core/java/com/android/server/am/ActivityStarter.java b/services/core/java/com/android/server/am/ActivityStarter.java index a31c33e4ab91..a145435976fa 100644 --- a/services/core/java/com/android/server/am/ActivityStarter.java +++ b/services/core/java/com/android/server/am/ActivityStarter.java @@ -17,7 +17,6 @@ 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; @@ -280,9 +279,7 @@ class ActivityStarter { // mLastStartActivityRecord[0] is set in the call to startActivity above. outActivity[0] = mLastStartActivityRecord[0]; } - - // Aborted results are treated as successes externally, but we must track them internally. - return mLastStartActivityResult != START_ABORTED ? mLastStartActivityResult : START_SUCCESS; + return mLastStartActivityResult; } /** DO NOT call this method directly. Use {@link #startActivityLocked} instead. */ @@ -468,7 +465,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_ABORTED; + return START_SUCCESS; } // If permissions need a review before any of the app components can run, we |