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

Commit e2e88248 authored by Ryan Bavetta's avatar Ryan Bavetta Committed by android-build-merger
Browse files

Merge "Fix soundtrigger test, adds null pointer check" into nyc-dev 

am: 840c617c

* commit '840c617c':
  Fix soundtrigger test, adds null pointer check
parents 78b37724 840c617c

core/java/android/hardware/soundtrigger/SoundTrigger.java

+17 −10
Original line number Diff line number Diff line
@@ -689,12 +689,19 @@ public class SoundTrigger { 
                return false;

            if (triggerInData != other.triggerInData)

                return false;

            if (captureFormat == null) {

                if (other.captureFormat != null)

                    return false;

            } else {

                if (other.captureFormat == null)

                    return false;

                if (captureFormat.getSampleRate() != other.captureFormat.getSampleRate())

                    return false;

                if (captureFormat.getEncoding() != other.captureFormat.getEncoding())

                    return false;

                if (captureFormat.getChannelMask() != other.captureFormat.getChannelMask())

                    return false;

            }

            return true;

        }