diff options
| author | Craig Mautner <cmautner@google.com> | 2014-07-25 17:43:37 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-07-25 17:43:37 +0000 |
| commit | 5ec618e3c3163928bd4c1109756764fcd9f90dae (patch) | |
| tree | 364577de0e2edd3a7f23e30fb22af2b01c6e8c9f | |
| parent | ca7a229eabbcca8f6d0b65df12bc5231d54a5ea4 (diff) | |
| parent | a9c5257a15f2efb5c017d2ecadb5a7360230bfee (diff) | |
| download | frameworks_base-5ec618e3c3163928bd4c1109756764fcd9f90dae.zip frameworks_base-5ec618e3c3163928bd4c1109756764fcd9f90dae.tar.gz frameworks_base-5ec618e3c3163928bd4c1109756764fcd9f90dae.tar.bz2 | |
am a9c5257a: am a0bb44ef: Merge "Finish crashed activities immediately" into klp-modular-dev
* commit 'a9c5257a15f2efb5c017d2ecadb5a7360230bfee':
Finish crashed activities immediately
| -rwxr-xr-x | services/core/java/com/android/server/am/ActivityStack.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/am/ActivityStack.java b/services/core/java/com/android/server/am/ActivityStack.java index 390fbba..1c0057b 100755 --- a/services/core/java/com/android/server/am/ActivityStack.java +++ b/services/core/java/com/android/server/am/ActivityStack.java @@ -3789,7 +3789,9 @@ final class ActivityStack { if (r.app == app) { Slog.w(TAG, " Force finishing activity " + r.intent.getComponent().flattenToShortString()); - finishActivityLocked(r, Activity.RESULT_CANCELED, null, "crashed", false); + // Force the destroy to skip right to removal. + r.app = null; + finishCurrentActivityLocked(r, FINISH_IMMEDIATELY, false); } } } |