diff options
| author | Mike Lockwood <lockwood@android.com> | 2011-03-10 07:56:59 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-03-10 07:56:59 -0800 |
| commit | 26d7eef69ef064ca716ed76220ca2984995882ed (patch) | |
| tree | 53527cff471cd4c9cd0c94a0d0862415e75b4a8e /services/jni | |
| parent | a3ae42ef0a94ce3cfc65a7e11d2e88dd11ea4c35 (diff) | |
| parent | 84edf14b62eaf3304252bb76b0b2ca3f518c8d54 (diff) | |
| download | frameworks_base-26d7eef69ef064ca716ed76220ca2984995882ed.zip frameworks_base-26d7eef69ef064ca716ed76220ca2984995882ed.tar.gz frameworks_base-26d7eef69ef064ca716ed76220ca2984995882ed.tar.bz2 | |
am 84edf14b: am cc08c439: Merge "UsbAccessory: Add URI string, replace type string with description" into honeycomb-mr1
* commit '84edf14b62eaf3304252bb76b0b2ca3f518c8d54':
UsbAccessory: Add URI string, replace type string with description
Diffstat (limited to 'services/jni')
| -rw-r--r-- | services/jni/com_android_server_UsbService.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/services/jni/com_android_server_UsbService.cpp b/services/jni/com_android_server_UsbService.cpp index 3c49e54..c66f181 100644 --- a/services/jni/com_android_server_UsbService.cpp +++ b/services/jni/com_android_server_UsbService.cpp @@ -193,12 +193,13 @@ static jobjectArray android_server_UsbService_getAccessoryStrings(JNIEnv *env, j return NULL; } jclass stringClass = env->FindClass("java/lang/String"); - jobjectArray strArray = env->NewObjectArray(4, stringClass, NULL); + jobjectArray strArray = env->NewObjectArray(5, stringClass, NULL); if (!strArray) goto out; set_accessory_string(env, fd, ACCESSORY_GET_STRING_MANUFACTURER, strArray, 0); set_accessory_string(env, fd, ACCESSORY_GET_STRING_MODEL, strArray, 1); - set_accessory_string(env, fd, ACCESSORY_GET_STRING_TYPE, strArray, 2); + set_accessory_string(env, fd, ACCESSORY_GET_STRING_DESCRIPTION, strArray, 2); set_accessory_string(env, fd, ACCESSORY_GET_STRING_VERSION, strArray, 3); + set_accessory_string(env, fd, ACCESSORY_GET_STRING_URI, strArray, 4); out: close(fd); |