summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTony Wickham <twickham@google.com>2017-09-18 17:11:33 (GMT)
committerAndroid (Google) Code Review <android-gerrit@google.com>2017-09-18 17:11:33 (GMT)
commit42b5f52b36909d88592ec1b30b42499642a294b8 (patch)
tree2da9ebf8ffa4ea82cd9ce1e6f122893d4c0d05b4
parent465435d16d8021859fe228a057e8fecbfc510fbd (diff)
parent22cb37745ca36023a455489a67c13de405a2c8b4 (diff)
downloadandroid_packages_apps_Trebuchet-42b5f52b36909d88592ec1b30b42499642a294b8.zip
android_packages_apps_Trebuchet-42b5f52b36909d88592ec1b30b42499642a294b8.tar.gz
android_packages_apps_Trebuchet-42b5f52b36909d88592ec1b30b42499642a294b8.tar.bz2
Merge "Ignore clicks on notifications that don't have intents." into ub-launcher3-dorval-polish2
-rw-r--r--src/com/android/launcher3/notification/NotificationInfo.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/com/android/launcher3/notification/NotificationInfo.java b/src/com/android/launcher3/notification/NotificationInfo.java
index 1b7c87b..6e36f4f 100644
--- a/src/com/android/launcher3/notification/NotificationInfo.java
+++ b/src/com/android/launcher3/notification/NotificationInfo.java
@@ -94,6 +94,9 @@ public class NotificationInfo implements View.OnClickListener {
@Override
public void onClick(View view) {
+ if (intent == null) {
+ return;
+ }
final Launcher launcher = Launcher.getLauncher(view.getContext());
Bundle activityOptions = ActivityOptions.makeClipRevealAnimation(
view, 0, 0, view.getWidth(), view.getHeight()).toBundle();