diff options
| author | Sunny Goyal <sunnygoyal@google.com> | 2015-07-16 14:09:05 -0700 |
|---|---|---|
| committer | Sunny Goyal <sunnygoyal@google.com> | 2015-07-16 14:09:53 -0700 |
| commit | 6c56c68555dcb3d99b05d5faecd582a1f683cc92 (patch) | |
| tree | a3583ab71b1e3f10d06c747c2f7436c981e1ee41 /src/com/android/launcher3/LauncherModel.java | |
| parent | 14031ebb81e21d6de216d39194f5bf5ff6c784ea (diff) | |
| download | android_packages_apps_Trebuchet-6c56c68555dcb3d99b05d5faecd582a1f683cc92.tar.gz android_packages_apps_Trebuchet-6c56c68555dcb3d99b05d5faecd582a1f683cc92.tar.bz2 android_packages_apps_Trebuchet-6c56c68555dcb3d99b05d5faecd582a1f683cc92.zip | |
Changing the dogfood check to a static boolean to better handle proguard optimizations
Change-Id: I892b88ce1a007fafc23a73ad4193c5c4aa411d1b
Diffstat (limited to 'src/com/android/launcher3/LauncherModel.java')
| -rw-r--r-- | src/com/android/launcher3/LauncherModel.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/com/android/launcher3/LauncherModel.java b/src/com/android/launcher3/LauncherModel.java index 8233ea2a2..497213895 100644 --- a/src/com/android/launcher3/LauncherModel.java +++ b/src/com/android/launcher3/LauncherModel.java @@ -55,6 +55,7 @@ import com.android.launcher3.compat.PackageInstallerCompat; import com.android.launcher3.compat.PackageInstallerCompat.PackageInstallInfo; import com.android.launcher3.compat.UserHandleCompat; import com.android.launcher3.compat.UserManagerCompat; +import com.android.launcher3.config.ProviderConfig; import com.android.launcher3.model.WidgetsModel; import com.android.launcher3.util.ComponentKey; import com.android.launcher3.util.CursorIconInfo; @@ -887,7 +888,7 @@ public class LauncherModel extends BroadcastReceiver } private void assertWorkspaceLoaded() { - if (LauncherAppState.isDogfoodBuild() && (isLoadingWorkspace() || !mHasLoaderCompletedOnce)) { + if (ProviderConfig.IS_DOGFOOD_BUILD && (isLoadingWorkspace() || !mHasLoaderCompletedOnce)) { throw new RuntimeException("Trying to add shortcut while loader is running"); } } @@ -2457,7 +2458,7 @@ public class LauncherModel extends BroadcastReceiver return (int) (lhs.screenId - rhs.screenId); } default: - if (LauncherAppState.isDogfoodBuild()) { + if (ProviderConfig.IS_DOGFOOD_BUILD) { throw new RuntimeException("Unexpected container type when " + "sorting workspace items."); } |