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

Merge "Debug for bug 18201239." into lmp-mr1-dev

Browse Source
This commit is contained in:
Craig Mautner
2015-01-15 23:18:39 +00:00
committed by Android (Google) Code Review
parent 112e35b464 9776ad41b9
commit 92cf3608b8
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/app/ActivityThread.java
View File

@@ -2939,6 +2939,8 @@ public final class ActivityThread {
+ ": " + e.toString(), e); + ": " + e.toString(), e);
} }
} }
} else {
Slog.i(TAG, "handleStopService: token=" + token + " not found.");
} }
//Slog.i(TAG, "Running services: " + mServices); //Slog.i(TAG, "Running services: " + mServices);
} }

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

@@ -69,7 +69,7 @@ public final class ActiveServices {
static final boolean DEBUG_DELAYED_SERVICE = ActivityManagerService.DEBUG_SERVICE; static final boolean DEBUG_DELAYED_SERVICE = ActivityManagerService.DEBUG_SERVICE;
static final boolean DEBUG_DELAYED_STARTS = DEBUG_DELAYED_SERVICE; static final boolean DEBUG_DELAYED_STARTS = DEBUG_DELAYED_SERVICE;
static final boolean DEBUG_MU = ActivityManagerService.DEBUG_MU; static final boolean DEBUG_MU = ActivityManagerService.DEBUG_MU;
static final boolean LOG_SERVICE_START_STOP = false; static final boolean LOG_SERVICE_START_STOP = true;
static final String TAG = ActivityManagerService.TAG; static final String TAG = ActivityManagerService.TAG;
static final String TAG_MU = ActivityManagerService.TAG_MU; static final String TAG_MU = ActivityManagerService.TAG_MU;
@@ -1869,7 +1869,7 @@ public final class ActiveServices {
private void serviceDoneExecutingLocked(ServiceRecord r, boolean inDestroying, private void serviceDoneExecutingLocked(ServiceRecord r, boolean inDestroying,
boolean finishing) { boolean finishing) {
if (DEBUG_SERVICE) Slog.v(TAG, "<<< DONE EXECUTING " + r if (true || DEBUG_SERVICE) Slog.v(TAG, "<<< DONE EXECUTING " + r
+ ": nesting=" + r.executeNesting + ": nesting=" + r.executeNesting
+ ", inDestroying=" + inDestroying + ", app=" + r.app); + ", inDestroying=" + inDestroying + ", app=" + r.app);
else if (DEBUG_SERVICE_EXECUTING) Slog.v(TAG, "<<< DONE EXECUTING " + r.shortName); else if (DEBUG_SERVICE_EXECUTING) Slog.v(TAG, "<<< DONE EXECUTING " + r.shortName);