From 03859d7c470a4da875b7033c372f51e255796c45 Mon Sep 17 00:00:00 2001
From: Lucas Dupin <dupin@google.com>
Date: Tue, 12 May 2020 12:27:47 -0700
Subject: [PATCH] Enable media resumption

Bug: 156369996
Test: make
Change-Id: I7d10591fd2bdca1b164cfb2a8e4d122b1a423562
---
 .../systemui/media/MediaDataManager.kt        | 35 +++++++------------
 .../src/com/android/systemui/util/Utils.java  |  2 +-
 2 files changed, 14 insertions(+), 23 deletions(-)

diff --git a/packages/SystemUI/src/com/android/systemui/media/MediaDataManager.kt b/packages/SystemUI/src/com/android/systemui/media/MediaDataManager.kt
index e7d0f7ec1a375..8da864cb7eed2 100644
--- a/packages/SystemUI/src/com/android/systemui/media/MediaDataManager.kt
+++ b/packages/SystemUI/src/com/android/systemui/media/MediaDataManager.kt
@@ -22,13 +22,11 @@ import android.content.Context
 import android.graphics.Bitmap
 import android.graphics.Canvas
 import android.graphics.ImageDecoder
-import android.graphics.Rect
 import android.graphics.drawable.Drawable
 import android.graphics.drawable.Icon
 import android.media.MediaMetadata
 import android.media.session.MediaSession
 import android.net.Uri
-import android.provider.Settings
 import android.service.notification.StatusBarNotification
 import android.text.TextUtils
 import android.util.Log
@@ -37,8 +35,8 @@ import com.android.systemui.dagger.qualifiers.Background
 import com.android.systemui.dagger.qualifiers.Main
 import com.android.systemui.statusbar.notification.MediaNotificationProcessor
 import com.android.systemui.statusbar.notification.row.HybridGroupManager
+import com.android.systemui.util.Utils
 import java.io.IOException
-import java.util.*
 import java.util.concurrent.Executor
 import javax.inject.Inject
 import javax.inject.Singleton
@@ -126,8 +124,8 @@ class MediaDataManager @Inject constructor(
         if (artWorkIcon != null) {
             // If we have art, get colors from that
             if (artworkBitmap == null) {
-                if (artWorkIcon.type == Icon.TYPE_BITMAP
-                        || artWorkIcon.type == Icon.TYPE_ADAPTIVE_BITMAP) {
+                if (artWorkIcon.type == Icon.TYPE_BITMAP ||
+                        artWorkIcon.type == Icon.TYPE_ADAPTIVE_BITMAP) {
                     artworkBitmap = artWorkIcon.bitmap
                 } else {
                     val drawable: Drawable = artWorkIcon.loadDrawable(context)
@@ -195,7 +193,6 @@ class MediaDataManager @Inject constructor(
                     song, artWorkIcon, actionIcons, actionsToShowCollapsed, sbn.packageName, token,
                     notif.contentIntent))
         }
-
     }
 
     /**
@@ -222,14 +219,14 @@ class MediaDataManager @Inject constructor(
      */
     private fun loadBitmapFromUri(uri: Uri): Bitmap? {
         // ImageDecoder requires a scheme of the following types
-        if (uri.getScheme() == null) {
-            return null;
+        if (uri.scheme == null) {
+            return null
         }
 
-        if (!uri.getScheme().equals(ContentResolver.SCHEME_CONTENT)
-                && !uri.getScheme().equals(ContentResolver.SCHEME_ANDROID_RESOURCE)
-                && !uri.getScheme().equals(ContentResolver.SCHEME_FILE)) {
-            return null;
+        if (!uri.scheme.equals(ContentResolver.SCHEME_CONTENT) &&
+                !uri.scheme.equals(ContentResolver.SCHEME_ANDROID_RESOURCE) &&
+                !uri.scheme.equals(ContentResolver.SCHEME_FILE)) {
+            return null
         }
 
         val source = ImageDecoder.createSource(context.getContentResolver(), uri)
@@ -260,27 +257,21 @@ class MediaDataManager @Inject constructor(
         }
     }
 
-    private fun isMediaNotification(sbn: StatusBarNotification) : Boolean {
-        if (!useUniversalMediaPlayer()) {
+    private fun isMediaNotification(sbn: StatusBarNotification): Boolean {
+        if (!Utils.useQsMediaPlayer(context)) {
             return false
         }
         if (!sbn.notification.hasMediaSession()) {
             return false
         }
         val notificationStyle = sbn.notification.notificationStyle
-        if (Notification.DecoratedMediaCustomViewStyle::class.java.equals(notificationStyle)
-                || Notification.MediaStyle::class.java.equals(notificationStyle)) {
+        if (Notification.DecoratedMediaCustomViewStyle::class.java.equals(notificationStyle) ||
+                Notification.MediaStyle::class.java.equals(notificationStyle)) {
             return true
         }
         return false
     }
 
-    /**
-     * are we using the universal media player
-     */
-    private fun useUniversalMediaPlayer()
-            = Settings.System.getInt(context.contentResolver, "qs_media_player", 1) > 0
-
     /**
      * Are there any media notifications active?
      */
diff --git a/packages/SystemUI/src/com/android/systemui/util/Utils.java b/packages/SystemUI/src/com/android/systemui/util/Utils.java
index 6a9d9b6e3ff14..b1792d003290d 100644
--- a/packages/SystemUI/src/com/android/systemui/util/Utils.java
+++ b/packages/SystemUI/src/com/android/systemui/util/Utils.java
@@ -130,7 +130,7 @@ public class Utils {
      */
     public static boolean useQsMediaPlayer(Context context) {
         int flag = Settings.Global.getInt(context.getContentResolver(),
-                Settings.Global.SHOW_MEDIA_ON_QUICK_SETTINGS, 0);
+                Settings.Global.SHOW_MEDIA_ON_QUICK_SETTINGS, 1);
         return flag > 0;
     }
 }