diff options
| author | Chris Wren <cwren@android.com> | 2014-05-12 16:07:25 -0400 |
|---|---|---|
| committer | Chris Wren <cwren@android.com> | 2014-05-12 16:10:46 -0400 |
| commit | 0e584b5802823091ef47dc165af5afbbe2c0ae42 (patch) | |
| tree | 209b976e56270a23021fd1db3a4ccd5bfb0a8c70 /src | |
| parent | a1f26fdb50862abe55f648925d0b07dfd28d8208 (diff) | |
| download | android_packages_apps_Trebuchet-0e584b5802823091ef47dc165af5afbbe2c0ae42.tar.gz android_packages_apps_Trebuchet-0e584b5802823091ef47dc165af5afbbe2c0ae42.tar.bz2 android_packages_apps_Trebuchet-0e584b5802823091ef47dc165af5afbbe2c0ae42.zip | |
check for long and short component names.
Bug: 14650346
Change-Id: Ic2195a4f60b63f8ec85c42284e0fd58d6f473a9f
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; |