diff options
| author | Sunny Goyal <sunnygoyal@google.com> | 2015-02-04 18:38:36 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-02-04 18:38:36 +0000 |
| commit | 980b2f053cac2deb7d85cff7465d1e02919f6a05 (patch) | |
| tree | 66acf2b8357c9fabe8afb21ed5eb6c8d94cf8a86 /src | |
| parent | 158da0802d701a27a7981137381621fc004ec73f (diff) | |
| parent | 4802b4107a66bc86996083b4835d1094ef4f4cbb (diff) | |
| download | android_packages_apps_Trebuchet-980b2f053cac2deb7d85cff7465d1e02919f6a05.tar.gz android_packages_apps_Trebuchet-980b2f053cac2deb7d85cff7465d1e02919f6a05.tar.bz2 android_packages_apps_Trebuchet-980b2f053cac2deb7d85cff7465d1e02919f6a05.zip | |
am 4802b410: Adding null-check before parsing an intent
* commit '4802b4107a66bc86996083b4835d1094ef4f4cbb':
Adding null-check before parsing an intent
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/launcher3/UninstallShortcutReceiver.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/com/android/launcher3/UninstallShortcutReceiver.java b/src/com/android/launcher3/UninstallShortcutReceiver.java index ccea4ec0c..c9d0bb5f5 100644 --- a/src/com/android/launcher3/UninstallShortcutReceiver.java +++ b/src/com/android/launcher3/UninstallShortcutReceiver.java @@ -104,7 +104,9 @@ public class UninstallShortcutReceiver extends BroadcastReceiver { try { while (c.moveToNext()) { try { - if (intent.filterEquals(Intent.parseUri(c.getString(intentIndex), 0))) { + String intentStr = c.getString(intentIndex); + if (intentStr != null + && intent.filterEquals(Intent.parseUri(intentStr, 0))) { final long id = c.getLong(idIndex); final Uri uri = LauncherSettings.Favorites.getContentUri(id, false); cr.delete(uri, null, null); |