summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Craig Mautner <cmautner@google.com> 2014-01-10 23:10:20 +0000
committer Android Git Automerger <android-git-automerger@android.com> 2014-01-10 23:10:20 +0000
commit7ef6c04afdf45bb5bfacd3c5a5bd24f349af140e (patch)
tree88fdd0bcc7d6df4d830a15e7425417640da56e69
parent6ae1bdebf308d3f857d586debbdd3c034ca85bb7 (diff)
parentd7c97a798f25d54a00adc0cfb2af4dedd5a4e3f2 (diff)
am d7c97a79: Merge "Remove misleading warnings." into klp-modular-dev
* commit 'd7c97a798f25d54a00adc0cfb2af4dedd5a4e3f2': Remove misleading warnings.
-rw-r--r--services/core/java/com/android/server/am/ActivityStackSupervisor.java9
1 files changed, 0 insertions, 9 deletions
diff --git a/services/core/java/com/android/server/am/ActivityStackSupervisor.java b/services/core/java/com/android/server/am/ActivityStackSupervisor.java
index 5e8c52c18edd..d897a912344e 100644
--- a/services/core/java/com/android/server/am/ActivityStackSupervisor.java
+++ b/services/core/java/com/android/server/am/ActivityStackSupervisor.java
@@ -1677,15 +1677,9 @@ public final class ActivityStackSupervisor implements DisplayListener {
// We don't need to start a new activity, and
// the client said not to do anything if that
// is the case, so this is it!
- if (r.task == null) Slog.v(TAG,
- "startActivityUncheckedLocked: task left null",
- new RuntimeException("here").fillInStackTrace());
return ActivityManager.START_RETURN_INTENT_TO_CALLER;
}
top.deliverNewIntentLocked(callingUid, r.intent);
- if (r.task == null) Slog.v(TAG,
- "startActivityUncheckedLocked: task left null",
- new RuntimeException("here").fillInStackTrace());
return ActivityManager.START_DELIVERED_TO_TOP;
}
}
@@ -1698,9 +1692,6 @@ public final class ActivityStackSupervisor implements DisplayListener {
r.requestCode, Activity.RESULT_CANCELED, null);
}
ActivityOptions.abort(options);
- if (r.task == null) Slog.v(TAG,
- "startActivityUncheckedLocked: task left null",
- new RuntimeException("here").fillInStackTrace());
return ActivityManager.START_CLASS_NOT_FOUND;
}