Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 228cefa8: am 3fb2b713: Merge "[ActivityManager] Reduce report ANR on wrong activity."

Browse Source 
* commit '228cefa83dd7b95e5581f619bb597808af726f80':
  [ActivityManager] Reduce report ANR on wrong activity.
This commit is contained in:
Craig Mautner
2014-04-07 22:21:33 +00:00
committed by Android Git Automerger
parent ec571bd203 228cefa83d
commit 8f2adcb10e
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/core/java/com/android/server/am/ActivityRecord.java Normal file → Executable file
View File

@@ -947,8 +947,8 @@ final class ActivityRecord {
// for another app to start, then we have paused dispatching // for another app to start, then we have paused dispatching
// for this activity. // for this activity.
ActivityRecord r = this; ActivityRecord r = this;
final ActivityStack stack = task.stack;
if (r.waitingVisible) { if (r.waitingVisible) {
final ActivityStack stack = mStackSupervisor.getFocusedStack();
// Hmmm, who might we be waiting for? // Hmmm, who might we be waiting for?
r = stack.mResumedActivity; r = stack.mResumedActivity;
if (r == null) { if (r == null) {