Merge "[Notif] Show block message for notif with multiple channels" into pi-dev

diff --cc packages/SystemUI/src/com/android/systemui/statusbar/NotificationInfo.java
index 6238526,9829704..81dd9e8
--- 1/packages/SystemUI/src/com/android/systemui/statusbar/NotificationInfo.java
--- 2/packages/SystemUI/src/com/android/systemui/statusbar/NotificationInfo.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationInfo.java
@@@ -308,15 -319,15 +319,15 @@@ public class NotificationInfo extends L
              minimize.setVisibility(GONE);
          }
  
 -        // Set up app settings link
 +        // Set up app settings link (i.e. Customize)
          TextView settingsLinkView = findViewById(R.id.app_settings);
-         Intent settingsIntent = getAppSettingsIntent(mPm, mPkg, mSingleNotificationChannel,
+         Intent settingsIntent = getAppSettingsIntent(mPm, mPackageName, mSingleNotificationChannel,
                  mSbn.getId(), mSbn.getTag());
 -        if (settingsIntent != null
 +        if (!mIsForBlockingHelper
 +                && settingsIntent != null
                  && !TextUtils.isEmpty(mSbn.getNotification().getSettingsText())) {
              settingsLinkView.setVisibility(VISIBLE);
 -            settingsLinkView.setText(mContext.getString(R.string.notification_app_settings,
 -                    mSbn.getNotification().getSettingsText()));
 +            settingsLinkView.setText(mContext.getString(R.string.notification_app_settings));
              settingsLinkView.setOnClickListener((View view) -> {
                  mAppSettingsClickListener.onClick(view, settingsIntent);
              });

diff --cc packages/SystemUI/tests/src/com/android/systemui/statusbar/NotificationInfoTest.java
Simple merge