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

Merge "Fix a bug where restartLoader would result in a stuck loader" into nyc-dev

Browse Source 
am: 596a4a1

* commit '596a4a1592a8f5e7b708d884145e280df9b638d0':
  Fix a bug where restartLoader would result in a stuck loader

Change-Id: I635309e5b37dfca8befdadeb578a71ae1619ac00
This commit is contained in:
Adam Powell
2016-04-27 19:18:31 +00:00
committed by android-build-merger
parent 55b53335a2 596a4a1592
commit dd587993ae
1 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
core/java/android/app/LoaderManager.java
View File

@@ -339,13 +339,16 @@ class LoaderManagerImpl extends LoaderManager {
} }
} }
void cancel() { boolean cancel() {
if (DEBUG) Log.v(TAG, " Canceling: " + this); if (DEBUG) Log.v(TAG, " Canceling: " + this);
if (mStarted && mLoader != null && mListenerRegistered) { if (mStarted && mLoader != null && mListenerRegistered) {
if (!mLoader.cancelLoad()) { final boolean cancelLoadResult = mLoader.cancelLoad();
if (!cancelLoadResult) {
onLoadCanceled(mLoader); onLoadCanceled(mLoader);
} }
return cancelLoadResult;
} }
return false;
} }
void destroy() { void destroy() {
@@ -667,20 +670,21 @@ class LoaderManagerImpl extends LoaderManager {
mInactiveLoaders.put(id, info); mInactiveLoaders.put(id, info);
} else { } else {
// We already have an inactive loader for this ID that we are // We already have an inactive loader for this ID that we are
// waiting for! What to do, what to do... // waiting for! Try to cancel; if this returns true then the task is still
if (!info.mStarted) { // running and we have more work to do.
// The current Loader has not been started... we thus if (!info.cancel()) {
// have no reason to keep it around, so bam, slam, // The current Loader has not been started or was successfully canceled,
// thank-you-ma'am. // we thus have no reason to keep it around. Remove it and a new
// LoaderInfo will be created below.
if (DEBUG) Log.v(TAG, " Current loader is stopped; replacing"); if (DEBUG) Log.v(TAG, " Current loader is stopped; replacing");
mLoaders.put(id, null); mLoaders.put(id, null);
info.destroy(); info.destroy();
} else { } else {
// Now we have three active loaders... we'll queue // Now we have three active loaders... we'll queue
// up this request to be processed once one of the other loaders // up this request to be processed once one of the other loaders
// finishes or is canceled. // finishes.
if (DEBUG) Log.v(TAG, " Current loader is running; attempting to cancel"); if (DEBUG) Log.v(TAG,
info.cancel(); " Current loader is running; configuring pending loader");
if (info.mPendingLoader != null) { if (info.mPendingLoader != null) {
if (DEBUG) Log.v(TAG, " Removing pending loader: " + info.mPendingLoader); if (DEBUG) Log.v(TAG, " Removing pending loader: " + info.mPendingLoader);
info.mPendingLoader.destroy(); info.mPendingLoader.destroy();