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

Change-Id: I804b5efde131e74fe9980f8131ceebbd7f118d29
2020-05-18 06:09:37 +00:00
parent ddc2b79eae 058881001f
commit 8ab04e08ee
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);
        }