commit 67deffed8408438e2f1defa07068f92e919adec9
author Sunny Goyal <sunnygoyal@google.com> Thu Jun 15 21:06:33 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Jun 15 21:06:33 2017 +0000
tree 31f165017c9530e49b755712e44f5e382fdd17bc
parent 539ddc1b46794096e6db99526dee00d0f1b4820c
parent 2de667d3af3328a3c3bd8cc32a45e7e543375fee

Merge "Fixing FLAG_PROVIDER_NOT_READY not being cleared in LoaderTask" into ub-launcher3-dorval-polish
am: 2de667d3af

Change-Id: I24fe0077dde448f9c5b05ec547d949fb4011058f

src/com/android/launcher3/model/LoaderTask.java

diff --git a/src/com/android/launcher3/model/LoaderTask.java b/src/com/android/launcher3/model/LoaderTask.java
index b24d682..bb2d0b6 100644
--- a/src/com/android/launcher3/model/LoaderTask.java
+++ b/src/com/android/launcher3/model/LoaderTask.java
@@ -576,7 +576,8 @@
                                     // 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 @@
                                         // 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;