diff options
| author | Mike Lockwood <lockwood@google.com> | 2015-01-26 18:59:46 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-01-26 18:59:46 +0000 |
| commit | 5ac22aa60f773917981f42e64fbc28615871fd3e (patch) | |
| tree | 5c5ac00fb2f863ba31dfc85a1ed8d106b814c277 /media/java/android/mtp/MtpPropertyGroup.java | |
| parent | 3ec4af9ff66b2a25e08916726486583f0c36b485 (diff) | |
| parent | 2b144a16f6ecb054f35a4836e92be39365688fe0 (diff) | |
| download | frameworks_base-5ac22aa60f773917981f42e64fbc28615871fd3e.zip frameworks_base-5ac22aa60f773917981f42e64fbc28615871fd3e.tar.gz frameworks_base-5ac22aa60f773917981f42e64fbc28615871fd3e.tar.bz2 | |
am 2b144a16: Merge "MTP: Fix partial implementation of 5 new audio specific properties" into lmp-mr1-dev
* commit '2b144a16f6ecb054f35a4836e92be39365688fe0':
MTP: Fix partial implementation of 5 new audio specific properties
Diffstat (limited to 'media/java/android/mtp/MtpPropertyGroup.java')
| -rw-r--r-- | media/java/android/mtp/MtpPropertyGroup.java | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/media/java/android/mtp/MtpPropertyGroup.java b/media/java/android/mtp/MtpPropertyGroup.java index 781988d..c80adfa 100644 --- a/media/java/android/mtp/MtpPropertyGroup.java +++ b/media/java/android/mtp/MtpPropertyGroup.java @@ -172,6 +172,17 @@ class MtpPropertyGroup { column = Images.ImageColumns.DESCRIPTION; type = MtpConstants.TYPE_STR; break; + case MtpConstants.PROPERTY_AUDIO_WAVE_CODEC: + case MtpConstants.PROPERTY_AUDIO_BITRATE: + case MtpConstants.PROPERTY_SAMPLE_RATE: + // these are special cased + type = MtpConstants.TYPE_UINT32; + break; + case MtpConstants.PROPERTY_BITRATE_TYPE: + case MtpConstants.PROPERTY_NUMBER_OF_CHANNELS: + // these are special cased + type = MtpConstants.TYPE_UINT16; + break; default: type = MtpConstants.TYPE_UNDEFINED; Log.e(TAG, "unsupported property " + code); @@ -420,6 +431,17 @@ class MtpPropertyGroup { result.setResult(MtpConstants.RESPONSE_INVALID_OBJECT_HANDLE); } break; + case MtpConstants.PROPERTY_AUDIO_WAVE_CODEC: + case MtpConstants.PROPERTY_AUDIO_BITRATE: + case MtpConstants.PROPERTY_SAMPLE_RATE: + // we don't have these in our database, so return 0 + result.append(handle, propertyCode, MtpConstants.TYPE_UINT32, 0); + break; + case MtpConstants.PROPERTY_BITRATE_TYPE: + case MtpConstants.PROPERTY_NUMBER_OF_CHANNELS: + // we don't have these in our database, so return 0 + result.append(handle, propertyCode, MtpConstants.TYPE_UINT16, 0); + break; default: if (property.type == MtpConstants.TYPE_STR) { result.append(handle, propertyCode, c.getString(column)); |