Merge "Merge "Update the 'is valid contentIntent' check" into tm-dev am: ee56c24ad8 am: e80ef180aa" into tm-d1-dev-plus-aosp

This commit is contained in:
Automerger Merge Worker
2022-05-14 01:15:07 +00:00
committed by Android (Google) Code Review

View File

@@ -98,9 +98,7 @@ public class NotificationSbnViewHolder extends RecyclerView.ViewHolder {
boolean isSnoozed, UiEventLogger uiEventLogger) {
Intent appIntent = itemView.getContext().getPackageManager()
.getLaunchIntentForPackage(pkg);
boolean isPendingIntentValid = pi != null && PendingIntent.getActivity(
itemView.getContext(), 0, pi.getIntent(),
PendingIntent.FLAG_IMMUTABLE | PendingIntent.FLAG_NO_CREATE) != null;
boolean isPendingIntentValid = pi != null && pi.isActivity();
if (isPendingIntentValid || appIntent != null) {
itemView.setOnClickListener(v -> {
uiEventLogger.logWithInstanceIdAndPosition(