commit 71483f417bb19f524cda41081f5ccac6084dc103
author Adam Cohen <adamcohen@google.com> Thu May 15 14:04:01 2014 -0700
committer Adam Cohen <adamcohen@google.com> Fri May 16 12:26:36 2014 -0700
tree ad718b9e47d98397f91182e080b3ae9a09bb3553
parent 97dd8c21efa751ebcaeaf4f10f40450bfa245f69

Removing antiquated migration path logic

-> also added some extra debugging for issue 14466459

Change-Id: I1ac9352c52c15d3e37f945cffabbca49343d2b8f

src/com/android/launcher3/LauncherModel.java

diff --git a/src/com/android/launcher3/LauncherModel.java b/src/com/android/launcher3/LauncherModel.java
index 585c238..4b5e68b 100644
--- a/src/com/android/launcher3/LauncherModel.java
+++ b/src/com/android/launcher3/LauncherModel.java
@@ -200,9 +200,19 @@
         ContentResolver contentResolver = context.getContentResolver();
 
         mAppsCanBeOnRemoveableStorage = Environment.isExternalStorageRemovable();
+        String oldProvider = context.getString(R.string.old_launcher_provider_uri);
         ContentProviderClient client = contentResolver.acquireContentProviderClient(
                 Uri.parse(context.getString(R.string.old_launcher_provider_uri)));
+
+        Log.d(TAG, "Old launcher provider: " + oldProvider);
         mOldContentProviderExists = (client != null);
+
+        if (mOldContentProviderExists) {
+            Log.d(TAG, "Old launcher provider exists.");
+        } else {
+            Log.d(TAG, "Old launcher provider does not exist.");
+        }
+
         if (client != null) {
             client.release();
         }
@@ -1817,9 +1827,8 @@
                 LauncherAppState.getLauncherProvider().loadDefaultFavoritesIfNecessary(0);
             }
 
-            // Check if we need to do any upgrade-path logic
-            // (Includes having just imported default favorites)
-            boolean loadedOldDb = LauncherAppState.getLauncherProvider().justLoadedOldDb();
+            // This code path is for our old migration code and should no longer be exercised
+            boolean loadedOldDb = false;
 
             // Log to disk
             Launcher.addDumpLog(TAG, "11683562 -   loadedOldDb: " + loadedOldDb, true);