commit 31d2f12addd50670dca4620acdaa97a708002222
author TreeHugger Robot <treehugger-gerrit@google.com> Wed May 18 20:16:17 2022 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed May 18 20:16:17 2022 +0000
tree 03e524f1c272116415986048dfc665b24aaea088
parent 81c48937f1a3f218bae13ec7ef11b318af83c603
parent 9d3f43c9b5e90c481ef43102b6624c74f770b24f

Merge "Fix potential null string comparison." into tm-dev

apps/CtsVerifier/src/com/android/cts/verifier/audio/midilib/MidiIODevice.java

diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/audio/midilib/MidiIODevice.java b/apps/CtsVerifier/src/com/android/cts/verifier/audio/midilib/MidiIODevice.java
index 64a891a..4e64162 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/audio/midilib/MidiIODevice.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/audio/midilib/MidiIODevice.java
@@ -71,10 +71,10 @@
             // manufacturer=AndroidCTSVerifier and product=VerifierMidiEcho or else
             // it might be some other MIDI app providing virtual MIDI services
             if (mDeviceType == MidiDeviceInfo.TYPE_VIRTUAL) {
-                if (!devBundle.getString(MidiDeviceInfo.PROPERTY_MANUFACTURER)
-                            .equals("AndroidCTSVerifier")
-                        || !devBundle.getString(MidiDeviceInfo.PROPERTY_PRODUCT)
-                            .equals("VerifierMidiEcho")) {
+                if (!"AndroidCTSVerifier".equals(
+                        devBundle.getString(MidiDeviceInfo.PROPERTY_MANUFACTURER))
+                        || !"VerifierMidiEcho".equals(
+                                devBundle.getString(MidiDeviceInfo.PROPERTY_PRODUCT))) {
                     // Virtual [but not ours]
                     Log.d(TAG, "Virtual Midi Device:" + devInfo);
                     continue;