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

Merge "Remove unused parameter" into main

Browse Source
This commit is contained in:
Santiago Seifert
2024-04-16 11:55:33 +00:00
committed by Android (Google) Code Review
parent 252d1f19ff 9892d7714a
commit b5aa766a25
3 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/media/MediaDeviceUpdateWorker.java
View File

@@ -81,7 +81,7 @@ public class MediaDeviceUpdateWorker extends SliceBackgroundWorker
mIsTouched = false; mIsTouched = false;
if (mLocalMediaManager == null || !TextUtils.equals(mPackageName, if (mLocalMediaManager == null || !TextUtils.equals(mPackageName,
mLocalMediaManager.getPackageName())) { mLocalMediaManager.getPackageName())) {
mLocalMediaManager = new LocalMediaManager(mContext, mPackageName, null); mLocalMediaManager = new LocalMediaManager(mContext, mPackageName);
} }
// Delaying initialization to allow mocking in Roboelectric tests. // Delaying initialization to allow mocking in Roboelectric tests.

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

@@ -92,8 +92,7 @@ public class MediaOutputIndicatorWorker extends SliceBackgroundWorker implements
} }
if (mLocalMediaManager == null || !TextUtils.equals(mPackageName, if (mLocalMediaManager == null || !TextUtils.equals(mPackageName,
mLocalMediaManager.getPackageName())) { mLocalMediaManager.getPackageName())) {
mLocalMediaManager = new LocalMediaManager(mContext, mPackageName, mLocalMediaManager = new LocalMediaManager(mContext, mPackageName);
null /* notification */);
} }
mLocalMediaManager.registerCallback(this); mLocalMediaManager.registerCallback(this);
mLocalMediaManager.startScan(); mLocalMediaManager.startScan();

2
src/com/android/settings/notification/RemoteVolumeGroupController.java
View File

@@ -68,7 +68,7 @@ public class RemoteVolumeGroupController extends BasePreferenceController implem
public RemoteVolumeGroupController(Context context, String preferenceKey) { public RemoteVolumeGroupController(Context context, String preferenceKey) {
super(context, preferenceKey); super(context, preferenceKey);
if (mLocalMediaManager == null) { if (mLocalMediaManager == null) {
mLocalMediaManager = new LocalMediaManager(mContext, null, null); mLocalMediaManager = new LocalMediaManager(mContext, /* packageName= */ null);
mLocalMediaManager.registerCallback(this); mLocalMediaManager.registerCallback(this);
mLocalMediaManager.startScan(); mLocalMediaManager.startScan();
} }