diff options
| author | Dianne Hackborn <hackbod@google.com> | 2012-05-07 15:12:33 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-05-07 15:12:33 -0700 |
| commit | bae365c166538d5c2319bf42aaf1715a1fb749e7 (patch) | |
| tree | 5aacc624571a4f69ce67dadb5f4304e580c00900 /core | |
| parent | d9aab5432e48211b1b89410ec290db5d9c511bf3 (diff) | |
| parent | 755c8bfbffe5134232217ef4c3998194b344ae17 (diff) | |
| download | frameworks_base-bae365c166538d5c2319bf42aaf1715a1fb749e7.zip frameworks_base-bae365c166538d5c2319bf42aaf1715a1fb749e7.tar.gz frameworks_base-bae365c166538d5c2319bf42aaf1715a1fb749e7.tar.bz2 | |
Merge "Fix issue #6319312: Consecutive call to Activity's onCreate()/onResume()..." into jb-dev
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/android/app/ActivityThread.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/core/java/android/app/ActivityThread.java b/core/java/android/app/ActivityThread.java index b55ee26..314f5c2 100644 --- a/core/java/android/app/ActivityThread.java +++ b/core/java/android/app/ActivityThread.java @@ -136,7 +136,7 @@ public final class ActivityThread { /** @hide */ public static final boolean DEBUG_BROADCAST = false; private static final boolean DEBUG_RESULTS = false; - private static final boolean DEBUG_BACKUP = true; + private static final boolean DEBUG_BACKUP = false; private static final boolean DEBUG_CONFIGURATION = false; private static final boolean DEBUG_SERVICE = false; private static final boolean DEBUG_MEMORY_TRIM = false; @@ -1172,10 +1172,10 @@ public final class ActivityThread { case DUMP_PROVIDER: return "DUMP_PROVIDER"; } } - return "(unknown)"; + return Integer.toString(code); } public void handleMessage(Message msg) { - if (DEBUG_MESSAGES) Slog.v(TAG, ">>> handling: " + msg.what); + if (DEBUG_MESSAGES) Slog.v(TAG, ">>> handling: " + codeToString(msg.what)); switch (msg.what) { case LAUNCH_ACTIVITY: { Trace.traceBegin(Trace.TRACE_TAG_ACTIVITY_MANAGER, "activityStart"); @@ -1378,7 +1378,7 @@ public final class ActivityThread { Trace.traceEnd(Trace.TRACE_TAG_ACTIVITY_MANAGER); break; } - if (DEBUG_MESSAGES) Slog.v(TAG, "<<< done: " + msg.what); + if (DEBUG_MESSAGES) Slog.v(TAG, "<<< done: " + codeToString(msg.what)); } private void maybeSnapshot() { |