Merge "Fix potential null string comparison." into tm-dev
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;