drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Finish crashed activities immediately" into klp-modular-dev

Browse Source
This commit is contained in:
Craig Mautner
2014-07-25 01:30:51 +00:00
committed by Android (Google) Code Review
parent b4dcc64fe6 8e5b133bf6
commit a0bb44efe9
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/core/java/com/android/server/am/ActivityStack.java
View File

@ -3579,7 +3579,9 @@ final class ActivityStack {
if (r.app == app) { if (r.app == app) {
Slog.w(TAG, " Force finishing activity " Slog.w(TAG, " Force finishing activity "
+ r.intent.getComponent().flattenToShortString()); + 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);
} }
} }
} }