Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Make MidiDeviceInfo accessible to native code"

Browse Source
This commit is contained in:
Mikhail Naganov
2016-09-22 22:36:05 +00:00
committed by Android (Google) Code Review
parent b3fe650041 84b674079d
commit 325db121f5
2 changed files with 33 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
media/java/android/media/midi/MidiDeviceInfo.aidl
View File

@@ -16,4 +16,4 @@
package android.media.midi;
parcelable MidiDeviceInfo;
parcelable MidiDeviceInfo cpp_header "media/MidiDeviceInfo.h";

37
media/java/android/media/midi/MidiDeviceInfo.java
View File

@@ -32,6 +32,11 @@ public final class MidiDeviceInfo implements Parcelable {
private static final String TAG = "MidiDeviceInfo";
/*
* Please note that constants and (un)marshalling code need to be kept in sync
* with the native implementation (MidiDeviceInfo.h|cpp)
*/
/**
* Constant representing USB MIDI devices for {@link #getType}
*/
@@ -321,15 +326,17 @@ public final class MidiDeviceInfo implements Parcelable {
public static final Parcelable.Creator<MidiDeviceInfo> CREATOR =
new Parcelable.Creator<MidiDeviceInfo>() {
public MidiDeviceInfo createFromParcel(Parcel in) {
// Needs to be kept in sync with code in MidiDeviceInfo.cpp
int type = in.readInt();
int id = in.readInt();
int inputPorts = in.readInt();
int outputPorts = in.readInt();
int inputPortCount = in.readInt();
int outputPortCount = in.readInt();
String[] inputPortNames = in.createStringArray();
String[] outputPortNames = in.createStringArray();
Bundle properties = in.readBundle();
boolean isPrivate = (in.readInt() == 1);
return new MidiDeviceInfo(type, id, inputPorts, outputPorts,
Bundle basicPropertiesIgnored = in.readBundle();
Bundle properties = in.readBundle();
return new MidiDeviceInfo(type, id, inputPortCount, outputPortCount,
inputPortNames, outputPortNames, properties, isPrivate);
}
@@ -342,14 +349,34 @@ public final class MidiDeviceInfo implements Parcelable {
return 0;
}
private Bundle getBasicProperties(String[] keys) {
Bundle basicProperties = new Bundle();
for (String key : keys) {
String val = mProperties.getString(key);
if (val != null) {
basicProperties.putString(key, val);
}
}
return basicProperties;
}
public void writeToParcel(Parcel parcel, int flags) {
// Needs to be kept in sync with code in MidiDeviceInfo.cpp
parcel.writeInt(mType);
parcel.writeInt(mId);
parcel.writeInt(mInputPortCount);
parcel.writeInt(mOutputPortCount);
parcel.writeStringArray(mInputPortNames);
parcel.writeStringArray(mOutputPortNames);
parcel.writeBundle(mProperties);
parcel.writeInt(mIsPrivate ? 1 : 0);
// "Basic" properties only contain properties of primitive types
// and thus can be read back by native code. "Extra" properties is
// a superset that contains all properties.
parcel.writeBundle(getBasicProperties(new String[] {
PROPERTY_NAME, PROPERTY_MANUFACTURER, PROPERTY_PRODUCT, PROPERTY_VERSION,
PROPERTY_SERIAL_NUMBER, PROPERTY_ALSA_CARD, PROPERTY_ALSA_DEVICE
}));
// Must be serialized last so native code can safely ignore it.
parcel.writeBundle(mProperties);
}
}