Merge "usb: correct return type of android_hardware_UsbDevice_claim_interface" (8a9cf925) · Commits · e / os / android_frameworks_base

core/jni/android_hardware_UsbDevice.cpp

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -86,7 +86,7 @@ android_hardware_UsbDevice_get_fd(JNIEnv *env, jobject thiz)
	return usb_device_get_fd(device);		return usb_device_get_fd(device);
	}		}

	static jint		static jboolean
	android_hardware_UsbDevice_claim_interface(JNIEnv *env, jobject thiz, int interfaceID, jboolean force)		android_hardware_UsbDevice_claim_interface(JNIEnv *env, jobject thiz, int interfaceID, jboolean force)
	{		{
	struct usb_device* device = get_device_from_object(env, thiz);		struct usb_device* device = get_device_from_object(env, thiz);
	@@ -101,7 +101,7 @@ android_hardware_UsbDevice_claim_interface(JNIEnv *env, jobject thiz, int interf
	usb_device_connect_kernel_driver(device, interfaceID, false);		usb_device_connect_kernel_driver(device, interfaceID, false);
	ret = usb_device_claim_interface(device, interfaceID);		ret = usb_device_claim_interface(device, interfaceID);
	}		}
	return ret;		return ret == 0;
	}		}

	static jint		static jint