From bfc4ed4dd4307f4e16f584a609d6645020d7107c Mon Sep 17 00:00:00 2001
From: bachinger <bachinger@google.com>
Date: Fri, 27 Jan 2023 18:11:27 +0000
Subject: [PATCH] Inline method in PlayerService that is used from on call site
 only

#cleanup
#minor-release

PiperOrigin-RevId: 505146915
(cherry picked from commit d7ef1ab5bd5a4508c0913011f5990bb03a57585a)
---
 .../media3/demo/session/PlaybackService.kt    | 46 ++++++++-----------
 1 file changed, 20 insertions(+), 26 deletions(-)

diff --git a/demos/session/src/main/java/androidx/media3/demo/session/PlaybackService.kt b/demos/session/src/main/java/androidx/media3/demo/session/PlaybackService.kt
index b5ba86ab22..192499d4e1 100644
--- a/demos/session/src/main/java/androidx/media3/demo/session/PlaybackService.kt
+++ b/demos/session/src/main/java/androidx/media3/demo/session/PlaybackService.kt
@@ -15,7 +15,6 @@
  */
 package androidx.media3.demo.session
 
-import android.app.Notification.BigTextStyle
 import android.app.NotificationChannel
 import android.app.NotificationManager
 import android.app.PendingIntent.*
@@ -272,34 +271,29 @@ class PlaybackService : MediaLibraryService() {
      * background.
      */
     override fun onForegroundServiceStartNotAllowedException() {
-      createNotificationAndNotify()
+      val notificationManagerCompat = NotificationManagerCompat.from(this@PlaybackService)
+      ensureNotificationChannel(notificationManagerCompat)
+      val pendingIntent =
+        TaskStackBuilder.create(this@PlaybackService).run {
+          addNextIntent(Intent(this@PlaybackService, MainActivity::class.java))
+
+          val immutableFlag = if (Build.VERSION.SDK_INT >= 23) FLAG_IMMUTABLE else 0
+          getPendingIntent(0, immutableFlag or FLAG_UPDATE_CURRENT)
+        }
+      val builder =
+        NotificationCompat.Builder(this@PlaybackService, CHANNEL_ID)
+          .setContentIntent(pendingIntent)
+          .setSmallIcon(R.drawable.media3_notification_small_icon)
+          .setContentTitle(getString(R.string.notification_content_title))
+          .setStyle(
+            NotificationCompat.BigTextStyle().bigText(getString(R.string.notification_content_text))
+          )
+          .setPriority(NotificationCompat.PRIORITY_DEFAULT)
+          .setAutoCancel(true)
+      notificationManagerCompat.notify(NOTIFICATION_ID, builder.build())
     }
   }
 
-  private fun createNotificationAndNotify() {
-    var notificationManagerCompat = NotificationManagerCompat.from(this)
-    ensureNotificationChannel(notificationManagerCompat)
-    var pendingIntent =
-      TaskStackBuilder.create(this).run {
-        addNextIntent(Intent(this@PlaybackService, MainActivity::class.java))
-
-        val immutableFlag = if (Build.VERSION.SDK_INT >= 23) FLAG_IMMUTABLE else 0
-        getPendingIntent(0, immutableFlag or FLAG_UPDATE_CURRENT)
-      }
-
-    var builder =
-      NotificationCompat.Builder(this, CHANNEL_ID)
-        .setContentIntent(pendingIntent)
-        .setSmallIcon(R.drawable.media3_notification_small_icon)
-        .setContentTitle(getString(R.string.notification_content_title))
-        .setStyle(
-          NotificationCompat.BigTextStyle().bigText(getString(R.string.notification_content_text))
-        )
-        .setPriority(NotificationCompat.PRIORITY_DEFAULT)
-        .setAutoCancel(true)
-    notificationManagerCompat.notify(NOTIFICATION_ID, builder.build())
-  }
-
   private fun ensureNotificationChannel(notificationManagerCompat: NotificationManagerCompat) {
     if (Util.SDK_INT < 26 || notificationManagerCompat.getNotificationChannel(CHANNEL_ID) != null) {
       return