Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b5aa766a authored by Santiago Seifert's avatar Santiago Seifert Committed by Android (Google) Code Review
Browse files

Merge "Remove unused parameter" into main

parents 252d1f19 9892d771

src/com/android/settings/media/MediaDeviceUpdateWorker.java

+1 −1
Original line number Diff line number Diff line
@@ -81,7 +81,7 @@ public class MediaDeviceUpdateWorker extends SliceBackgroundWorker 
        mIsTouched = false;

        if (mLocalMediaManager == null || !TextUtils.equals(mPackageName,

                mLocalMediaManager.getPackageName())) {

            mLocalMediaManager = new LocalMediaManager(mContext, mPackageName, null);

            mLocalMediaManager = new LocalMediaManager(mContext, mPackageName);

        }



        // Delaying initialization to allow mocking in Roboelectric tests.

src/com/android/settings/media/MediaOutputIndicatorWorker.java

+1 −2
Original line number Diff line number Diff line
@@ -92,8 +92,7 @@ public class MediaOutputIndicatorWorker extends SliceBackgroundWorker implements 
            }

            if (mLocalMediaManager == null || !TextUtils.equals(mPackageName,

                    mLocalMediaManager.getPackageName())) {

                mLocalMediaManager = new LocalMediaManager(mContext, mPackageName,

                        null /* notification */);

                mLocalMediaManager = new LocalMediaManager(mContext, mPackageName);

            }

            mLocalMediaManager.registerCallback(this);

            mLocalMediaManager.startScan();

src/com/android/settings/notification/RemoteVolumeGroupController.java

+1 −1
Original line number Diff line number Diff line
@@ -68,7 +68,7 @@ public class RemoteVolumeGroupController extends BasePreferenceController implem 
    public RemoteVolumeGroupController(Context context, String preferenceKey) {

        super(context, preferenceKey);

        if (mLocalMediaManager == null) {

            mLocalMediaManager = new LocalMediaManager(mContext, null, null);

            mLocalMediaManager = new LocalMediaManager(mContext, /* packageName= */ null);

            mLocalMediaManager.registerCallback(this);

            mLocalMediaManager.startScan();

        }