Fix warning about using flag on API level < 23 (#4321)

Author: lfkellogg

firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/impl/FirebaseAppDistributionNotificationsManager.java

@@ -112,21 +112,16 @@ private PendingIntent createAppLaunchIntent() {
       LogWrapper.getInstance().w(TAG, "No activity found to launch app");
       return null;
     }
-    return PendingIntent.getActivity(
-        context, 0, intent, getPendingIntentFlags(PendingIntent.FLAG_ONE_SHOT));
+    return getPendingIntent(intent, PendingIntent.FLAG_ONE_SHOT);
   }
 
-  /**
-   * Adds {@link PendingIntent#FLAG_IMMUTABLE} to a PendingIntent's flags since any PendingIntents
-   * used here don't need to be modified.
-   *
-   * <p>Specifying mutability is required starting at SDK level 31.
-   */
-  private static int getPendingIntentFlags(int baseFlags) {
-    // Only add on platform levels that support FLAG_IMMUTABLE.
-    return Build.VERSION.SDK_INT >= Build.VERSION_CODES.M
-        ? baseFlags | PendingIntent.FLAG_IMMUTABLE
-        : baseFlags;
+  private PendingIntent getPendingIntent(Intent intent, int extraFlags) {
+    // Specify mutability because it is required starting at SDK level 31, but FLAG_IMMUTABLE is
+    // only supported starting at SDK level 23
+    int commonFlags =
+        Build.VERSION.SDK_INT >= Build.VERSION_CODES.M ? PendingIntent.FLAG_IMMUTABLE : 0;
+    return PendingIntent.getActivity(
+        context, /* requestCode = */ 0, intent, extraFlags | commonFlags);
   }
 
   public void showFeedbackNotification(
@@ -151,9 +146,6 @@ public void showFeedbackNotification(
     Intent intent = new Intent(context, TakeScreenshotAndStartFeedbackActivity.class);
     intent.addFlags(Intent.FLAG_ACTIVITY_NO_HISTORY);
     intent.putExtra(TakeScreenshotAndStartFeedbackActivity.INFO_TEXT_EXTRA_KEY, infoText);
-    PendingIntent pendingIntent =
-        PendingIntent.getActivity(
-            context, /* requestCode = */ 0, intent, PendingIntent.FLAG_IMMUTABLE);
     ApplicationInfo applicationInfo = context.getApplicationInfo();
     PackageManager packageManager = context.getPackageManager();
     CharSequence appLabel = packageManager.getApplicationLabel(applicationInfo);
@@ -166,7 +158,7 @@ public void showFeedbackNotification(
             .setOngoing(true)
             .setOnlyAlertOnce(true)
             .setAutoCancel(false)
-            .setContentIntent(pendingIntent);
+            .setContentIntent(getPendingIntent(intent, /* extraFlags= */ 0));
     LogWrapper.getInstance().i(TAG, "Showing feedback notification");
     notificationManager.notify(
         Notification.FEEDBACK.tag, Notification.FEEDBACK.id, builder.build());