Merge "Fixing potential crash when the task loader is stopped. (Bug 18135583)" into lmp-mr1-dev automerge: b55f7d7

automerge: 0baa55a

* commit '0baa55a74342b558139879201bd55d4f8cc8e5a8':
  Fixing potential crash when the task loader is stopped. (Bug 18135583)

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