diff options
| author | Winson Chung <winsonc@google.com> | 2014-10-27 23:39:09 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-10-27 23:39:11 +0000 |
| commit | b55f7d79d19e8d8786fab8faabedb2f253bfacf8 (patch) | |
| tree | d5bcd255e7139f5542a4d888c46a159e7d14301f /packages | |
| parent | e79553355b10815be2cd44f7b84ae39c91a12bb1 (diff) | |
| parent | f14fdda21293d1f4bb4f35932833a9f05be554e2 (diff) | |
| download | frameworks_base-b55f7d79d19e8d8786fab8faabedb2f253bfacf8.zip frameworks_base-b55f7d79d19e8d8786fab8faabedb2f253bfacf8.tar.gz frameworks_base-b55f7d79d19e8d8786fab8faabedb2f253bfacf8.tar.bz2 | |
Merge "Fixing potential crash when the task loader is stopped. (Bug 18135583)" into lmp-mr1-dev
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/recents/model/RecentsTaskLoader.java | 3 |
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(); |