Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
automerge: b55f7d7

* commit 'b55f7d79d19e8d8786fab8faabedb2f253bfacf8':
  Fixing potential crash when the task loader is stopped. (Bug 18135583)
This commit is contained in:
Winson Chung
2014-10-27 23:53:52 +00:00
committed by android-build-merger
parent 05cff4047d b55f7d79d1
commit 0baa55a743
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -171,6 +171,9 @@ class TaskResourceLoader implements Runnable {
} }
} else { } else {
SystemServicesProxy ssp = mSystemServicesProxy; 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 // Load the next item from the queue
final Task t = mLoadQueue.nextTask(); final Task t = mLoadQueue.nextTask();