commit 1daf7f792a8ffee5851ad60314d0c87b60e902b0
author Sunny Goyal <sunnygoyal@google.com> Thu Sep 17 22:07:19 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Sep 17 22:07:19 2015 +0000
tree 76bbfb16d9b4c811019f7fa6c3d3f233b9108297
parent a0a311ec21d30a51206623b0063fc2bb1bbb6d56
parent 3a6205f820bc2cca7d669342f191216d654be0a3

Merge "Build fix" into ub-launcher3-master

src/com/android/launcher3/LauncherModel.java

diff --git a/src/com/android/launcher3/LauncherModel.java b/src/com/android/launcher3/LauncherModel.java
index 82f20ec..05271d4 100644
--- a/src/com/android/launcher3/LauncherModel.java
+++ b/src/com/android/launcher3/LauncherModel.java
@@ -3320,7 +3320,7 @@
                                             .setPackage(pkg), 0);
                             needToRefresh |= widgets != null && !widgets.isEmpty();
                         } catch (RuntimeException e) {
-                            if (LauncherAppState.isDogfoodBuild()) {
+                            if (ProviderConfig.IS_DOGFOOD_BUILD) {
                                 throw e;
                             }
                             // Ignore the crash. We can live with a state widget list.
@@ -3377,7 +3377,7 @@
                 return results;
             }
         } catch (Exception e) {
-            if (!LauncherAppState.isDogfoodBuild() &&
+            if (!ProviderConfig.IS_DOGFOOD_BUILD &&
                     (e.getCause() instanceof TransactionTooLargeException ||
                     e.getCause() instanceof DeadObjectException)) {
                 // the returned value may be incomplete and will not be refreshed until the next