diff options
| author | Mike Lockwood <lockwood@android.com> | 2011-03-14 21:56:33 -0400 |
|---|---|---|
| committer | Mike Lockwood <lockwood@android.com> | 2011-03-15 16:50:18 -0400 |
| commit | 638d7cb3ee0bb3596b01dc19eca9456fa72a36e0 (patch) | |
| tree | ff1b7ca2724da9b62c1b6a0c2dced0d4f11b76e7 /services/jni | |
| parent | bf079216c607b660a0ad219df6c4752906a7fc61 (diff) | |
| download | frameworks_base-638d7cb3ee0bb3596b01dc19eca9456fa72a36e0.zip frameworks_base-638d7cb3ee0bb3596b01dc19eca9456fa72a36e0.tar.gz frameworks_base-638d7cb3ee0bb3596b01dc19eca9456fa72a36e0.tar.bz2 | |
DO NOT MERGE: Backport more USB accessory changes from honeycomb
Change-Id: I8459c5ab9fbf0b3cad752041484a5de44ca9badd
Signed-off-by: Mike Lockwood <lockwood@android.com>
Diffstat (limited to 'services/jni')
| -rw-r--r-- | services/jni/com_android_server_UsbService.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/services/jni/com_android_server_UsbService.cpp b/services/jni/com_android_server_UsbService.cpp index 2ce0eaa..92c5008 100644 --- a/services/jni/com_android_server_UsbService.cpp +++ b/services/jni/com_android_server_UsbService.cpp @@ -78,13 +78,14 @@ static jobjectArray android_server_UsbService_getAccessoryStrings(JNIEnv *env, j return NULL; } jclass stringClass = env->FindClass("java/lang/String"); - jobjectArray strArray = env->NewObjectArray(5, stringClass, NULL); + jobjectArray strArray = env->NewObjectArray(6, 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_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); + set_accessory_string(env, fd, ACCESSORY_GET_STRING_SERIAL, strArray, 5); out: close(fd); |