diff options
| author | Winson Chung <winsonc@google.com> | 2014-01-15 10:33:02 -0800 |
|---|---|---|
| committer | Winson Chung <winsonc@google.com> | 2014-01-15 11:34:54 -0800 |
| commit | e43a1e788223ab5a4405c5eeb0133ff57efbc768 (patch) | |
| tree | 093a9450720c4c595c3d822daf8e709ce96b80ac /src/com/android/launcher3/LauncherModel.java | |
| parent | 44f834133e106550a67ecf246e8bc9d4e1644c56 (diff) | |
| download | android_packages_apps_Trebuchet-e43a1e788223ab5a4405c5eeb0133ff57efbc768.tar.gz android_packages_apps_Trebuchet-e43a1e788223ab5a4405c5eeb0133ff57efbc768.tar.bz2 android_packages_apps_Trebuchet-e43a1e788223ab5a4405c5eeb0133ff57efbc768.zip | |
Tightening migration conditions. (Bug 11973614)
Change-Id: I6d7417b705227472d035f428cbec933cc6dbf2ce
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 d271976a7..4478e9bbd 100644 --- a/src/com/android/launcher3/LauncherModel.java +++ b/src/com/android/launcher3/LauncherModel.java @@ -227,8 +227,8 @@ public class LauncherModel extends BroadcastReceiver { } } - boolean canMigrateFromOldLauncherDb() { - return mOldContentProviderExists; + boolean canMigrateFromOldLauncherDb(Launcher launcher) { + return mOldContentProviderExists && !launcher.isLauncherPreinstalled() ; } static boolean findNextAvailableIconSpaceInScreen(ArrayList<ItemInfo> items, int[] xy, |