summaryrefslogtreecommitdiffstats
path: root/services
diff options
context:
space:
mode:
authorCraig Mautner <cmautner@google.com>2014-10-15 23:40:54 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-10-15 23:40:54 +0000
commitd1a58c45fee09c5e599fe173d5055546fe147b03 (patch)
treed734f0f9b89385eded2bebaf7138c71fc16ecf1e /services
parentde96b966fb6c8e0694f3a94fc0f42d64090d4fa0 (diff)
parent5d460b88715c8a902eb3930e690ddd1b8d84338f (diff)
downloadframeworks_base-d1a58c45fee09c5e599fe173d5055546fe147b03.zip
frameworks_base-d1a58c45fee09c5e599fe173d5055546fe147b03.tar.gz
frameworks_base-d1a58c45fee09c5e599fe173d5055546fe147b03.tar.bz2
am 5d460b88: Merge "Remove unnecessary logging." into lmp-dev
* commit '5d460b88715c8a902eb3930e690ddd1b8d84338f': Remove unnecessary logging.
Diffstat (limited to 'services')
-rw-r--r--services/core/java/com/android/server/am/ActivityStackSupervisor.java1
1 files changed, 0 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/am/ActivityStackSupervisor.java b/services/core/java/com/android/server/am/ActivityStackSupervisor.java
index 879ddc0..03dd3c0 100644
--- a/services/core/java/com/android/server/am/ActivityStackSupervisor.java
+++ b/services/core/java/com/android/server/am/ActivityStackSupervisor.java
@@ -2061,7 +2061,6 @@ public final class ActivityStackSupervisor implements DisplayListener {
final TaskRecord topTask = targetStack.topTask();
if (topTask != sourceTask) {
targetStack.moveTaskToFrontLocked(sourceTask, r, options);
- Slog.w(TAG, "top task and source task don't match. would have caused anr");
} else {
mWindowManager.moveTaskToTop(topTask.taskId);
}