PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge ""Play null on" displayed under media volume" into rvc-dev am: 9a9ce2b2fa

Browse Source 
Change-Id: I0de78f61bbd5061738982b6a44b6c201c3de452c
This commit is contained in:
tim peng
2020-05-18 23:23:27 +00:00
committed by Automerger Merge Worker
parent 173dedce2f 9a9ce2b2fa
commit c5e7d82305
2 changed files with 49 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/com/android/settings/media/MediaOutputIndicatorWorker.java
View File

@@ -81,14 +81,17 @@ public class MediaOutputIndicatorWorker extends SliceBackgroundWorker implements
mContext.registerReceiver(mReceiver, intentFilter);
mLocalBluetoothManager.getEventManager().registerCallback(this);
if (mLocalMediaManager == null) {
final MediaController controller = getActiveLocalMediaController();
if (controller != null) {
mPackageName = controller.getPackageName();
}
mLocalMediaManager = new LocalMediaManager(mContext, mPackageName, null);
final MediaController controller = getActiveLocalMediaController();
if (controller == null) {
mPackageName = null;
} else {
mPackageName = controller.getPackageName();
}
if (mLocalMediaManager == null || !TextUtils.equals(mPackageName,
mLocalMediaManager.getPackageName())) {
mLocalMediaManager = new LocalMediaManager(mContext, mPackageName,
null /* notification */);
}
mLocalMediaManager.registerCallback(this);
mLocalMediaManager.startScan();
}