diff options
| author | Sunny Goyal <sunnygoyal@google.com> | 2014-11-14 19:08:50 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-14 19:08:50 +0000 |
| commit | 1f68c7c85bc9ad31672c8e62ef6e4687bc08ead6 (patch) | |
| tree | 10b1b3300a6be1921caf6df69df05d279cba43d6 /src/com/android | |
| parent | a15f89100160c4b4eb7f70bce28943577bc70165 (diff) | |
| parent | 06910a88445c46fb95c9ad5ff83793e37b6af692 (diff) | |
| download | android_packages_apps_Trebuchet-1f68c7c85bc9ad31672c8e62ef6e4687bc08ead6.tar.gz android_packages_apps_Trebuchet-1f68c7c85bc9ad31672c8e62ef6e4687bc08ead6.tar.bz2 android_packages_apps_Trebuchet-1f68c7c85bc9ad31672c8e62ef6e4687bc08ead6.zip | |
am 06910a88: Fixing NullPointer Exception when user is deleted.
* commit '06910a88445c46fb95c9ad5ff83793e37b6af692':
Fixing NullPointer Exception when user is deleted.
Diffstat (limited to 'src/com/android')
| -rw-r--r-- | src/com/android/launcher3/InstallShortcutReceiver.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/com/android/launcher3/InstallShortcutReceiver.java b/src/com/android/launcher3/InstallShortcutReceiver.java index 9103fad77..395c34192 100644 --- a/src/com/android/launcher3/InstallShortcutReceiver.java +++ b/src/com/android/launcher3/InstallShortcutReceiver.java @@ -388,6 +388,9 @@ public class InstallShortcutReceiver extends BroadcastReceiver { // The is an internal launcher target shortcut. UserHandleCompat user = UserManagerCompat.getInstance(context) .getUserForSerialNumber(object.getLong(USER_HANDLE_KEY)); + if (user == null) { + return null; + } LauncherActivityInfoCompat info = LauncherAppsCompat.getInstance(context) .resolveActivity(launcherIntent, user); |