Merge "Update the 'is valid contentIntent' check" into tm-dev

This commit is contained in:
TreeHugger Robot
2022-05-14 00:59:01 +00:00
committed by Android (Google) Code Review

View File

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