commit f14fdda21293d1f4bb4f35932833a9f05be554e2
author winsonchung <winsonc@winsonc-macpro.mtv.corp.google.com> Mon Oct 27 12:01:14 2014 -0700
committer Winson Chung <winsonc@google.com> Mon Oct 27 12:08:54 2014 -0700
tree 680732201aeea18e863e79c0e6afc2e285583e9f
parent 0841cf7f37d7b20a08fa894c366f32fde55ea7e9

Fixing potential crash when the task loader is stopped. (Bug 18135583)

Change-Id: I44f766e52f05c38a1b6c4a2e7942e3d6ecaae501

packages/SystemUI/src/com/android/systemui/recents/model/RecentsTaskLoader.java

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 @@
                 }
             } 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();