Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e6a2068c authored by Winson Chung's avatar Winson Chung Committed by android-build-merger
Browse files

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

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

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

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

+3 −0
Original line number Diff line number Diff line
@@ -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();