Merge "MidiDeviceInfo: Fix NPE for devices with no port names"

1 files changed, 10 insertions, 2 deletions

diff --git a/media/java/android/media/midi/MidiDeviceInfo.java b/media/java/android/media/midi/MidiDeviceInfo.java
index f7fad3d2a85d..93e0939f0d84 100644
--- a/media/java/android/media/midi/MidiDeviceInfo.java
+++ b/media/java/android/media/midi/MidiDeviceInfo.java
@@ -173,8 +173,16 @@ public final class MidiDeviceInfo implements Parcelable {
         mId = id;
         mInputPortCount = numInputPorts;
         mOutputPortCount = numOutputPorts;
-        mInputPortNames = inputPortNames;
-        mOutputPortNames = outputPortNames;
+        if (inputPortNames == null) {
+            mInputPortNames = new String[numInputPorts];
+        } else {
+            mInputPortNames = inputPortNames;
+        }
+        if (outputPortNames == null) {
+            mOutputPortNames = new String[numOutputPorts];
+        } else {
+            mOutputPortNames = outputPortNames;
+        }
         mProperties = properties;
         mIsPrivate = isPrivate;
     }