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

Commit 9cd49760 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Add a missing null pointer check in the codec config comparison logic"

parents 4c41f5fa f2afc24f

android/app/src/com/android/bluetooth/a2dp/A2dpStateMachine.java

+6 −5
Original line number Original line Diff line number Diff line
@@ -631,12 +631,13 @@ final class A2dpStateMachine extends StateMachine { 
            if ((prevCodecConfig != null)

            if ((prevCodecConfig != null)

                    && (prevCodecConfig.getCodecType() != newCodecConfig.getCodecType())) {

                    && (prevCodecConfig.getCodecType() != newCodecConfig.getCodecType())) {

                update = true;

                update = true;

            }

            } else if (!newCodecConfig.sameAudioFeedingParameters(prevCodecConfig)) {

            if (!newCodecConfig.sameAudioFeedingParameters(prevCodecConfig)) {

                update = true;

                update = true;

            }

            } else if ((newCodecConfig.getCodecType()

            if ((newCodecConfig.getCodecType() == BluetoothCodecConfig.SOURCE_CODEC_TYPE_LDAC)

                        == BluetoothCodecConfig.SOURCE_CODEC_TYPE_LDAC)

                    && prevCodecConfig.getCodecSpecific1() != newCodecConfig.getCodecSpecific1()) {

                    && (prevCodecConfig != null)

                    && (prevCodecConfig.getCodecSpecific1()

                        != newCodecConfig.getCodecSpecific1())) {

                update = true;

                update = true;

            }

            }

            if (update) {

            if (update) {