Merge "Fixing FLAG_PROVIDER_NOT_READY not being cleared in LoaderTask" into ub-launcher3-dorval-polish

2017-06-15 21:01:34 +00:00
parent 922f84acf2 571e12da66
commit 2de667d3af
1 changed files with 2 additions and 4 deletions
@@ -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;