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

Merge "Perform activityIdleInternal in correct order."

Browse Source
This commit is contained in:
Craig Mautner
2013-04-03 05:40:08 +00:00
committed by Android (Google) Code Review
parent 3131580086 8be5ea3bdb
commit 3ee1a66c1e
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
services/java/com/android/server/am/ActivityManagerService.java
View File

@ -4371,11 +4371,11 @@ public final class ActivityManagerService extends ActivityManagerNative
@Override
public final void activityIdle(IBinder token, Configuration config, boolean stopProfiling) {
final long origId = Binder.clearCallingIdentity();
if (stopProfiling) {
synchronized (this) {
ActivityStack stack = ActivityRecord.getStackLocked(token);
if (stack != null) {
ActivityRecord r = stack.activityIdleInternalLocked(token, false, config);
synchronized (this) {
ActivityStack stack = ActivityRecord.getStackLocked(token);
if (stack != null) {
ActivityRecord r = stack.activityIdleInternalLocked(token, false, config);
if (stopProfiling) {
if ((mProfileProc == r.app) && (mProfileFd != null)) {
try {
mProfileFd.close();