summaryrefslogtreecommitdiffstats
path: root/packages/SystemUI/src/com/android/systemui/recents
diff options
context:
space:
mode:
authorwinsonchung <winsonc@winsonc-macpro.mtv.corp.google.com>2014-10-27 12:01:14 -0700
committerWinson Chung <winsonc@google.com>2014-10-27 12:08:54 -0700
commitf14fdda21293d1f4bb4f35932833a9f05be554e2 (patch)
tree680732201aeea18e863e79c0e6afc2e285583e9f /packages/SystemUI/src/com/android/systemui/recents
parent0841cf7f37d7b20a08fa894c366f32fde55ea7e9 (diff)
downloadframeworks_base-f14fdda21293d1f4bb4f35932833a9f05be554e2.zip
frameworks_base-f14fdda21293d1f4bb4f35932833a9f05be554e2.tar.gz
frameworks_base-f14fdda21293d1f4bb4f35932833a9f05be554e2.tar.bz2
Fixing potential crash when the task loader is stopped. (Bug 18135583)
Change-Id: I44f766e52f05c38a1b6c4a2e7942e3d6ecaae501
Diffstat (limited to 'packages/SystemUI/src/com/android/systemui/recents')
-rw-r--r--packages/SystemUI/src/com/android/systemui/recents/model/RecentsTaskLoader.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/recents/model/RecentsTaskLoader.java b/packages/SystemUI/src/com/android/systemui/recents/model/RecentsTaskLoader.java
index 594eb0e..b4f62d5 100644
--- a/packages/SystemUI/src/com/android/systemui/recents/model/RecentsTaskLoader.java
+++ b/packages/SystemUI/src/com/android/systemui/recents/model/RecentsTaskLoader.java
@@ -171,6 +171,9 @@ class TaskResourceLoader implements Runnable {
}
} else {
SystemServicesProxy ssp = mSystemServicesProxy;
+ // If we've stopped the loader, then fall thorugh to the above logic to wait on
+ // the load thread
+ if (ssp == null) continue;
// Load the next item from the queue
final Task t = mLoadQueue.nextTask();