commit 0bfccebc9b276b857c992790232cc8477a8a3504
author Jason Monk <jmonk@google.com> Fri Mar 21 15:42:06 2014 -0400
committer Jason Monk <jmonk@google.com> Fri Mar 21 15:42:06 2014 -0400
tree 6f8dfc520e5dfb1b8867302113303285aa2b69f1
parent fa4c799a9bc6b2eb55ce21609591d49f5c5ea9ba

Allow the old launcher content URI to be overrided

Move the URI used to import favorites from launcher2 to be loaded
from a string resource.  This allows it to be overridden.

This will enable permissions fix for GoogleSearch.

Bug: 12058200
Change-Id: I31243fe89f545c9771d5cceffe1c9e7668a42bc5

src/com/android/launcher3/LauncherModel.java

diff --git a/src/com/android/launcher3/LauncherModel.java b/src/com/android/launcher3/LauncherModel.java
index 145d225..937f02b 100644
--- a/src/com/android/launcher3/LauncherModel.java
+++ b/src/com/android/launcher3/LauncherModel.java
@@ -193,7 +193,7 @@
 
         mAppsCanBeOnRemoveableStorage = Environment.isExternalStorageRemovable();
         ContentProviderClient client = contentResolver.acquireContentProviderClient(
-                LauncherSettings.Favorites.OLD_CONTENT_URI);
+                Uri.parse(context.getString(R.string.old_launcher_provider_uri)));
         mOldContentProviderExists = (client != null);
         if (client != null) {
             client.release();