From 6b3856d5ded0d850ef98617a7ef2a0cb1259154c Mon Sep 17 00:00:00 2001
From: hughchen <hughchen@google.com>
Date: Wed, 18 Dec 2019 19:29:06 +0800
Subject: [PATCH] Get package name on worker instead of on slice

Bug: 144535188
Test: make -j42 RunSettingsRoboTests
Change-Id: I3aa9c7ccf8df23527b8d2b79033c96ec1289c7ea
---
 .../settings/media/MediaDeviceUpdateWorker.java        | 10 ++++------
 src/com/android/settings/media/MediaOutputSlice.java   |  8 +-------
 .../android/settings/media/MediaOutputSliceTest.java   |  1 -
 3 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/src/com/android/settings/media/MediaDeviceUpdateWorker.java b/src/com/android/settings/media/MediaDeviceUpdateWorker.java
index 21d8237a7cd..a9c9086d6fd 100644
--- a/src/com/android/settings/media/MediaDeviceUpdateWorker.java
+++ b/src/com/android/settings/media/MediaDeviceUpdateWorker.java
@@ -18,6 +18,8 @@ package com.android.settings.media;
 
 import static android.media.AudioManager.STREAM_DEVICES_CHANGED_ACTION;
 
+import static com.android.settings.media.MediaOutputSlice.MEDIA_PACKAGE_NAME;
+
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
@@ -45,8 +47,7 @@ public class MediaDeviceUpdateWorker extends SliceBackgroundWorker
     private final Context mContext;
     private final List<MediaDevice> mMediaDevices = new ArrayList<>();
     private final DevicesChangedBroadcastReceiver mReceiver;
-
-    private String mPackageName;
+    private final String mPackageName;
 
     @VisibleForTesting
     LocalMediaManager mLocalMediaManager;
@@ -54,13 +55,10 @@ public class MediaDeviceUpdateWorker extends SliceBackgroundWorker
     public MediaDeviceUpdateWorker(Context context, Uri uri) {
         super(context, uri);
         mContext = context;
+        mPackageName = uri.getQueryParameter(MEDIA_PACKAGE_NAME);
         mReceiver = new DevicesChangedBroadcastReceiver();
     }
 
-    public void setPackageName(String packageName) {
-        mPackageName = packageName;
-    }
-
     @Override
     protected void onSlicePinned() {
         mMediaDevices.clear();
diff --git a/src/com/android/settings/media/MediaOutputSlice.java b/src/com/android/settings/media/MediaOutputSlice.java
index 2b70cafc0b7..fbdf01c48d2 100644
--- a/src/com/android/settings/media/MediaOutputSlice.java
+++ b/src/com/android/settings/media/MediaOutputSlice.java
@@ -55,16 +55,13 @@ public class MediaOutputSlice implements CustomSliceable {
     private final Context mContext;
 
     private MediaDeviceUpdateWorker mWorker;
-    private String mPackageName;
 
     public MediaOutputSlice(Context context) {
         mContext = context;
-        mPackageName = getUri().getQueryParameter(MEDIA_PACKAGE_NAME);
     }
 
     @VisibleForTesting
     void init(String packageName, MediaDeviceUpdateWorker worker) {
-        mPackageName = packageName;
         mWorker = worker;
     }
 
@@ -129,10 +126,7 @@ public class MediaOutputSlice implements CustomSliceable {
 
     private MediaDeviceUpdateWorker getWorker() {
         if (mWorker == null) {
-            mWorker = (MediaDeviceUpdateWorker) SliceBackgroundWorker.getInstance(getUri());
-            if (mWorker != null) {
-                mWorker.setPackageName(mPackageName);
-            }
+            mWorker = SliceBackgroundWorker.getInstance(getUri());
         }
         return mWorker;
     }
diff --git a/tests/robotests/src/com/android/settings/media/MediaOutputSliceTest.java b/tests/robotests/src/com/android/settings/media/MediaOutputSliceTest.java
index f01ef0e17b6..288c8e869d0 100644
--- a/tests/robotests/src/com/android/settings/media/MediaOutputSliceTest.java
+++ b/tests/robotests/src/com/android/settings/media/MediaOutputSliceTest.java
@@ -98,7 +98,6 @@ public class MediaOutputSliceTest {
 
         mMediaOutputSlice = new MediaOutputSlice(mContext);
         mMediaDeviceUpdateWorker = new MediaDeviceUpdateWorker(mContext, MEDIA_OUTPUT_SLICE_URI);
-        mMediaDeviceUpdateWorker.setPackageName(TEST_PACKAGE_NAME);
         mMediaDeviceUpdateWorker.onDeviceListUpdate(mDevices);
         mMediaDeviceUpdateWorker.mLocalMediaManager = mLocalMediaManager;
         mMediaOutputSlice.init(TEST_PACKAGE_NAME, mMediaDeviceUpdateWorker);