diff options
author | Mike Lockwood <lockwood@android.com> | 2011-03-09 22:03:57 -0500 |
---|---|---|
committer | Mike Lockwood <lockwood@android.com> | 2011-03-09 22:12:49 -0500 |
commit | ac36d7c715a9cd793b2dce6de547594810101c3a (patch) | |
tree | 5f347132f5896785d47519c1ae728af1113db1f0 /services/jni | |
parent | b966b9d9e882835691e5adda292d89dd704df71c (diff) | |
download | frameworks_base-ac36d7c715a9cd793b2dce6de547594810101c3a.zip frameworks_base-ac36d7c715a9cd793b2dce6de547594810101c3a.tar.gz frameworks_base-ac36d7c715a9cd793b2dce6de547594810101c3a.tar.bz2 |
UsbAccessory: Add URI string, replace type string with description
This is a first step toward adding USB accessory URI support
BUG: 4073248
Modified USB accessory matching logic to look only at manufacturer, model and version
(description and URI are not considered when matching apps to accessories)
Also added test for USB accessory protocol version to accessorytest
BUG: 4080288
Change-Id: I992a3433c74efa7a7db37bf030f02c1f0c92f9e2
Signed-off-by: Mike Lockwood <lockwood@android.com>
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); |