commit 46a07220ad1beb8f59b27ebe5ab13d2a27a299c1
author Sunny Goyal <sunnygoyal@google.com> Fri Sep 18 17:18:46 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Sep 18 17:18:46 2015 +0000
tree 29eec3c9099e128d1c6d3882843195dd97651cbd
parent b3cf2d789e0de5d1f70b3f4ffea9cb6926b43d75
parent 877f92893a758bbac389614ddce8e687bf62cfd2

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 b4095a6..0f043ce 100644
--- a/src/com/android/launcher3/LauncherModel.java
+++ b/src/com/android/launcher3/LauncherModel.java
@@ -3417,7 +3417,7 @@
                 List<ResolveInfo> providers = packageManager.queryIntentActivities(shortcutsIntent, 0);
                 sBgShortcutProviders = providers;
             } catch (RuntimeException e) {
-                if (!LauncherAppState.isDogfoodBuild() &&
+                if (!ProviderConfig.IS_DOGFOOD_BUILD &&
                         (e.getCause() instanceof TransactionTooLargeException ||
                                 e.getCause() instanceof DeadObjectException)) {
                     /**