summaryrefslogtreecommitdiff
path: root/core/java/android/app/ActivityThread.java
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2011-09-01 11:17:06 -0700
committerDianne Hackborn <hackbod@google.com>2011-09-01 12:39:17 -0700
commitba24e4d8bbeb60e96d74f05e21691dad61ce497e (patch)
treea9546623a2358532720b7448cd874dd62191258f /core/java/android/app/ActivityThread.java
parent1434ab98e690cbcfcdcd2296b491a44bff14cc55 (diff)
Fix issue #5229575: Youtube link shared through messaging is not...
...opening after selecting option "Youtube" as a luncher. Also: * Tweak window animations so that the wallpaper exist animations do not stop too early (causing the wallpaper to suddenly disappear). * Make sure no input is being processed while booting, to avoid accidentally doing things especially in the upgrade dialog. * Some other small cleanup. Change-Id: I40a6b53731991d4e31ac4502e3d85f0e47507481
Diffstat (limited to 'core/java/android/app/ActivityThread.java')
-rw-r--r--core/java/android/app/ActivityThread.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/core/java/android/app/ActivityThread.java b/core/java/android/app/ActivityThread.java
index e3075d763ed3..8275cbd6152c 100644
--- a/core/java/android/app/ActivityThread.java
+++ b/core/java/android/app/ActivityThread.java
@@ -1291,7 +1291,8 @@ public final class ActivityThread {
public final boolean queueIdle() {
ActivityClientRecord a = mNewActivities;
boolean stopProfiling = false;
- if (mBoundApplication.profileFd != null && mBoundApplication.autoStopProfiler) {
+ if (mBoundApplication != null && mBoundApplication.profileFd != null
+ && mBoundApplication.autoStopProfiler) {
stopProfiling = true;
}
if (a != null) {