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

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18376072

Change-Id: I6a4f307e2422320de15b418f31b8e2467592646d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Automerger Merge Worker
2022-05-14 01:28:53 +00:00

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(