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

Commit 1eead951 authored by tim peng's avatar tim peng Committed by Automerger Merge Worker
Browse files

Merge "Add null object checking" into rvc-dev am: bb6f50ce am: 046a03e5 

Change-Id: I97977e58edd3b096def16bf7172d9843649b26b8
parents d848a01a 046a03e5

packages/SettingsLib/src/com/android/settingslib/media/LocalMediaManager.java

+3 −2
Original line number Diff line number Diff line
@@ -440,8 +440,9 @@ public class LocalMediaManager implements BluetoothCallback { 
            MediaDevice connectDevice = getMediaDeviceById(mMediaDevices, id);

            connectDevice = connectDevice != null

                    ? connectDevice : updateCurrentConnectedDevice();

            if (connectDevice != null) {

                connectDevice.setState(MediaDeviceState.STATE_CONNECTED);



            }

            if (connectDevice == mCurrentConnectedDevice) {

                Log.d(TAG, "onConnectedDeviceChanged() this device all ready connected!");

                return;

packages/SettingsLib/tests/robotests/src/com/android/settingslib/media/LocalMediaManagerTest.java

+6 −0
Original line number Diff line number Diff line
@@ -449,6 +449,12 @@ public class LocalMediaManagerTest { 
                .STATE_CONNECTED);

    }



    @Test

    public void onConnectedDeviceChanged_nullConnectedDevice_noException() {

        mLocalMediaManager.registerCallback(mCallback);

        mLocalMediaManager.mMediaDeviceCallback.onConnectedDeviceChanged(TEST_DEVICE_ID_2);

    }



    @Test

    public void onDeviceAttributesChanged_shouldDispatchDeviceListUpdate() {

        mLocalMediaManager.registerCallback(mCallback);