diff options
author | Han Wang <416810799@qq.com> | 2019-12-02 11:42:44 +0200 |
---|---|---|
committer | Han Wang <416810799@qq.com> | 2019-12-02 11:55:57 +0200 |
commit | 309b97c977bacfe043d4ea057064d5a4d0615b0d (patch) | |
tree | 8db54f301a2d49f8778ec9ff3603dcb9b0a49fe3 | |
parent | 572e0102e90c611af38cd135b0b522b63b8d3cd5 (diff) | |
download | android_packages_apps_Trebuchet-309b97c977bacfe043d4ea057064d5a4d0615b0d.tar.gz android_packages_apps_Trebuchet-309b97c977bacfe043d4ea057064d5a4d0615b0d.tar.bz2 android_packages_apps_Trebuchet-309b97c977bacfe043d4ea057064d5a4d0615b0d.zip |
Trebuchet: Avoid NPE in startAppShortcutOrInfoActivity()
* Fixes: https://gitlab.com/LineageOS/issues/android/issues/1450
Change-Id: I18ad506d7991e0190b89b113209389ef3217f2db
-rw-r--r-- | src/com/android/launcher3/touch/ItemClickHandler.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/com/android/launcher3/touch/ItemClickHandler.java b/src/com/android/launcher3/touch/ItemClickHandler.java index fbf10cfe4..0f1b3a9f0 100644 --- a/src/com/android/launcher3/touch/ItemClickHandler.java +++ b/src/com/android/launcher3/touch/ItemClickHandler.java @@ -24,6 +24,7 @@ import static com.android.launcher3.Launcher.REQUEST_BIND_PENDING_APPWIDGET; import static com.android.launcher3.Launcher.REQUEST_RECONFIGURE_APPWIDGET; import android.app.AlertDialog; +import android.content.ComponentName; import android.content.Intent; import android.os.Process; import android.text.TextUtils; @@ -230,7 +231,8 @@ public class ItemClickHandler { } TrustDatabaseHelper db = TrustDatabaseHelper.getInstance(launcher); - boolean isProtected = db.isPackageProtected(item.getTargetComponent().getPackageName()); + ComponentName cn = item.getTargetComponent(); + boolean isProtected = cn != null && db.isPackageProtected(cn.getPackageName()); if (isProtected) { launcher.startActivitySafelyAuth(v, intent, item); |