Merge "Output switcher shows the device list by an incorrect package name" into rvc-dev am: 0581bd7f1c am: 51e997cfd8

Change-Id: I7059fe368dae4d21e39d0e219c0b33b94cae29d3
2020-05-18 05:39:29 +00:00
parent 53715ebd3f 51e997cfd8
commit a9693c3080
2 changed files with 37 additions and 2 deletions
--- a/src/com/android/settings/media/MediaDeviceUpdateWorker.java
+++ b/src/com/android/settings/media/MediaDeviceUpdateWorker.java
@@ -73,7 +73,8 @@ public class MediaDeviceUpdateWorker extends SliceBackgroundWorker
    protected void onSlicePinned() {
        mMediaDevices.clear();
        mIsTouched = false;
-        if (mLocalMediaManager == null) {
+        if (mLocalMediaManager == null || !TextUtils.equals(mPackageName,
+                mLocalMediaManager.getPackageName())) {
            mLocalMediaManager = new LocalMediaManager(mContext, mPackageName, null);
        }