diff options
| author | Mike Lockwood <lockwood@android.com> | 2011-03-10 07:50:30 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-03-10 07:50:30 -0800 |
| commit | cc08c439bc7b0afbdafc5ca18c584d2f7724f3df (patch) | |
| tree | 219bad973dd1af80c377bb8e9e5355e70b843bac /services/jni | |
| parent | 3de30a4c1e48d92af14154abddd4fb6fe0c6aa13 (diff) | |
| parent | ac36d7c715a9cd793b2dce6de547594810101c3a (diff) | |
| download | frameworks_base-cc08c439bc7b0afbdafc5ca18c584d2f7724f3df.zip frameworks_base-cc08c439bc7b0afbdafc5ca18c584d2f7724f3df.tar.gz frameworks_base-cc08c439bc7b0afbdafc5ca18c584d2f7724f3df.tar.bz2 | |
Merge "UsbAccessory: Add URI string, replace type string with description" into honeycomb-mr1
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); |