diff options
| author | Chris Wren <cwren@android.com> | 2014-05-12 20:46:38 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-05-12 20:46:39 +0000 |
| commit | 418dcb881a62162b2834321d362c2f8f01962493 (patch) | |
| tree | d03803b2a65ea4e7ebdb58f37d032f717af1af8f /src | |
| parent | e0aaa0d3de0eedf5501fee762e0d8279a9e3bc3c (diff) | |
| parent | 0e584b5802823091ef47dc165af5afbbe2c0ae42 (diff) | |
| download | android_packages_apps_Trebuchet-418dcb881a62162b2834321d362c2f8f01962493.tar.gz android_packages_apps_Trebuchet-418dcb881a62162b2834321d362c2f8f01962493.tar.bz2 android_packages_apps_Trebuchet-418dcb881a62162b2834321d362c2f8f01962493.zip | |
Merge "check for long and short component names." into ub-now-nova
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/launcher3/LauncherModel.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/com/android/launcher3/LauncherModel.java b/src/com/android/launcher3/LauncherModel.java index 8af097041..585c238c3 100644 --- a/src/com/android/launcher3/LauncherModel.java +++ b/src/com/android/launcher3/LauncherModel.java @@ -853,10 +853,12 @@ public class LauncherModel extends BroadcastReceiver return false; } String componentName = component.flattenToString(); + String shortName = component.flattenToShortString(); long serialNumber = UserManagerCompat.getInstance(context) .getSerialNumberForUser(user); - final String where = "intent glob \"*component=" + componentName + "*\" and restored = 1" - + " and profileId = " + serialNumber; + final String where = "(intent glob \"*component=" + componentName + "*\" or " + + "intent glob \"*component=" + shortName + "*\")" + + "and restored = 1 and profileId = " + serialNumber; Cursor c = cr.query(LauncherSettings.Favorites.CONTENT_URI, new String[]{"intent", "restored", "profileId"}, where, null, null); boolean result = false; |