diff options
| author | Michael Jurka <mikejurka@google.com> | 2012-05-14 12:24:22 -0700 |
|---|---|---|
| committer | Michael Jurka <mikejurka@google.com> | 2012-05-14 12:28:54 -0700 |
| commit | 9ad005639e1698c94674cdfadf3ae342fb56c9b5 (patch) | |
| tree | b4e819a5e883eb7809da750f75d6f91ff8ea8f9e /src | |
| parent | a5a771ca1fd2fea7c898ad6d1eb616df4e2f38f5 (diff) | |
| download | android_packages_apps_Trebuchet-9ad005639e1698c94674cdfadf3ae342fb56c9b5.tar.gz android_packages_apps_Trebuchet-9ad005639e1698c94674cdfadf3ae342fb56c9b5.tar.bz2 android_packages_apps_Trebuchet-9ad005639e1698c94674cdfadf3ae342fb56c9b5.zip | |
Fix issue where Google Voice shortcuts would disappear
Bug: 6449123
Change-Id: I1d8c314ec954caf332d10be927d16ee45f325df8
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/launcher2/LauncherModel.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/com/android/launcher2/LauncherModel.java b/src/com/android/launcher2/LauncherModel.java index bc88a987d..fc1a26d4b 100644 --- a/src/com/android/launcher2/LauncherModel.java +++ b/src/com/android/launcher2/LauncherModel.java @@ -1089,7 +1089,9 @@ public class LauncherModel extends BroadcastReceiver { // App shortcuts that used to be automatically added to Launcher // didn't always have the correct intent flags set, so do that here - if (intent.getAction().equals(Intent.ACTION_MAIN) && + if (intent.getAction() != null && + intent.getCategories() != null && + intent.getAction().equals(Intent.ACTION_MAIN) && intent.getCategories().contains(Intent.CATEGORY_LAUNCHER)) { intent.addFlags( Intent.FLAG_ACTIVITY_NEW_TASK | |