diff options
| author | Sunny Goyal <sunnygoyal@google.com> | 2017-06-15 21:01:34 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-06-15 21:01:35 +0000 |
| commit | 2de667d3af3328a3c3bd8cc32a45e7e543375fee (patch) | |
| tree | e8c618ed96ac07b005344f7bfcd8e42379ea4a65 /src | |
| parent | 922f84acf28c9f46e3cab2aae89918086af0ce15 (diff) | |
| parent | 571e12da665d24ab9a6d26af39432591e7f84f08 (diff) | |
| download | android_packages_apps_Trebuchet-2de667d3af3328a3c3bd8cc32a45e7e543375fee.tar.gz android_packages_apps_Trebuchet-2de667d3af3328a3c3bd8cc32a45e7e543375fee.tar.bz2 android_packages_apps_Trebuchet-2de667d3af3328a3c3bd8cc32a45e7e543375fee.zip | |
Merge "Fixing FLAG_PROVIDER_NOT_READY not being cleared in LoaderTask" into ub-launcher3-dorval-polish
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/launcher3/model/LoaderTask.java | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/com/android/launcher3/model/LoaderTask.java b/src/com/android/launcher3/model/LoaderTask.java index b24d68251..bb2d0b6af 100644 --- a/src/com/android/launcher3/model/LoaderTask.java +++ b/src/com/android/launcher3/model/LoaderTask.java @@ -576,7 +576,8 @@ public class LoaderTask implements Runnable { // available or not available. We do not need to track // any future restore updates. int status = c.restoreFlag & - ~LauncherAppWidgetInfo.FLAG_RESTORE_STARTED; + ~LauncherAppWidgetInfo.FLAG_RESTORE_STARTED & + ~LauncherAppWidgetInfo.FLAG_PROVIDER_NOT_READY; if (!wasProviderReady) { // If provider was not previously ready, update the // status and UI flag. @@ -584,9 +585,6 @@ public class LoaderTask implements Runnable { // Id would be valid only if the widget restore broadcast was received. if (isIdValid) { status |= LauncherAppWidgetInfo.FLAG_UI_NOT_READY; - } else { - status &= ~LauncherAppWidgetInfo - .FLAG_PROVIDER_NOT_READY; } } appWidgetInfo.restoreStatus = status; |