From f14fdda21293d1f4bb4f35932833a9f05be554e2 Mon Sep 17 00:00:00 2001 From: winsonchung Date: Mon, 27 Oct 2014 12:01:14 -0700 Subject: [PATCH] Fixing potential crash when the task loader is stopped. (Bug 18135583) Change-Id: I44f766e52f05c38a1b6c4a2e7942e3d6ecaae501 --- .../com/android/systemui/recents/model/RecentsTaskLoader.java | 3 +++ 1 file changed, 3 insertions(+) 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 594eb0e43c125..b4f62d5ef4905 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();