summaryrefslogtreecommitdiffstats
path: root/services/java/com
diff options
context:
space:
mode:
authorCraig Mautner <cmautner@google.com>2013-08-12 12:29:40 -0700
committerCraig Mautner <cmautner@google.com>2013-08-12 12:29:40 -0700
commit61574705d34a31a60b53f7dd7231f1dcb1e31608 (patch)
tree2fd07a82656e28b0de1611b9bf53c883b525ca8c /services/java/com
parent7a605df3137ee571dec855761c0cb15b28513d26 (diff)
downloadframeworks_base-61574705d34a31a60b53f7dd7231f1dcb1e31608.zip
frameworks_base-61574705d34a31a60b53f7dd7231f1dcb1e31608.tar.gz
frameworks_base-61574705d34a31a60b53f7dd7231f1dcb1e31608.tar.bz2
Remove incorrect warning.
The warning about an ActivityRecord not being assigned a task was incorrect in the location modified by this fix. In this case an existing ActivityRecord is relaunched so it is not necessary to assign the task to the passed ActivityRecord. Addresses the warning associated with bug 10181389. Change-Id: I76d5066c320bf9da2663bc34bcaca801ad4953bc
Diffstat (limited to 'services/java/com')
-rw-r--r--services/java/com/android/server/am/ActivityStackSupervisor.java3
1 files changed, 0 insertions, 3 deletions
diff --git a/services/java/com/android/server/am/ActivityStackSupervisor.java b/services/java/com/android/server/am/ActivityStackSupervisor.java
index 8634929..0808861 100644
--- a/services/java/com/android/server/am/ActivityStackSupervisor.java
+++ b/services/java/com/android/server/am/ActivityStackSupervisor.java
@@ -1684,9 +1684,6 @@ public final class ActivityStackSupervisor {
setLaunchHomeTaskNextFlag(sourceRecord, null, targetStack);
targetStack.resumeTopActivityLocked(null);
}
- if (r.task == null) Slog.v(TAG,
- "startActivityUncheckedLocked: task left null",
- new RuntimeException("here").fillInStackTrace());
return ActivityManager.START_DELIVERED_TO_TOP;
}
}