From e05f05dd78ca156f9937814e5f6ca5ec85f5dcdd Mon Sep 17 00:00:00 2001 From: Sunny Goyal Date: Fri, 14 Nov 2014 10:14:18 -0800 Subject: Fixing NullPointer Exception when user is deleted. Bug: 18388507 Change-Id: I4176ea37a019c2a862e6b2875cc6b03ec9118571 --- src/com/android/launcher3/InstallShortcutReceiver.java | 3 +++ 1 file changed, 3 insertions(+) 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); -- cgit v1.2.3