diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2017-03-07 22:42:13 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-03-07 22:42:14 +0000 |
| commit | 93ce56fdb2e06e790b1a8e78f5ade257fc2fb55d (patch) | |
| tree | 4a27403cc089ed504d94d3f8614808898d9f5531 /src/com/android/launcher3/LauncherModel.java | |
| parent | b265ba74490d8ded8659db0d63f50c471d793802 (diff) | |
| parent | 3d706ad70365052e3224fc4f4b0e7d1f5e8abf22 (diff) | |
| download | android_packages_apps_Trebuchet-93ce56fdb2e06e790b1a8e78f5ade257fc2fb55d.tar.gz android_packages_apps_Trebuchet-93ce56fdb2e06e790b1a8e78f5ade257fc2fb55d.tar.bz2 android_packages_apps_Trebuchet-93ce56fdb2e06e790b1a8e78f5ade257fc2fb55d.zip | |
Merge "Separating the config and flags in different directories so that it is easier to override one or the other" into ub-launcher3-master
Diffstat (limited to 'src/com/android/launcher3/LauncherModel.java')
| -rw-r--r-- | src/com/android/launcher3/LauncherModel.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/com/android/launcher3/LauncherModel.java b/src/com/android/launcher3/LauncherModel.java index 10b65a985..35811d38a 100644 --- a/src/com/android/launcher3/LauncherModel.java +++ b/src/com/android/launcher3/LauncherModel.java @@ -44,7 +44,7 @@ import com.android.launcher3.compat.LauncherAppsCompat; import com.android.launcher3.compat.PackageInstallerCompat; import com.android.launcher3.compat.PackageInstallerCompat.PackageInstallInfo; import com.android.launcher3.compat.UserManagerCompat; -import com.android.launcher3.config.ProviderConfig; +import com.android.launcher3.config.FeatureFlags; import com.android.launcher3.dynamicui.ExtractionUtils; import com.android.launcher3.folder.Folder; import com.android.launcher3.folder.FolderIcon; @@ -1371,7 +1371,7 @@ public class LauncherModel extends BroadcastReceiver return Utilities.longCompare(lhs.screenId, rhs.screenId); } default: - if (ProviderConfig.IS_DOGFOOD_BUILD) { + if (FeatureFlags.IS_DOGFOOD_BUILD) { throw new RuntimeException("Unexpected container type when " + "sorting workspace items."); } |