Merge "Add missing style change to android_mtp_MtpDevice.cpp." (c1a7328d) · Commits · e / os / android_frameworks_base

media/jni/android_mtp_MtpDevice.cpp

+7 −6

Original line number	Diff line number	Diff line
		@@ -97,10 +97,6 @@ static jfieldID field_objectInfo_keywords;
		static jfieldID field_event_eventCode;

		class JavaArrayWriter {
		JNIEnv* mEnv;
		jbyteArray mArray;
		jsize mSize;

		public:
		JavaArrayWriter(JNIEnv* env, jbyteArray array) :
		mEnv(env), mArray(array), mSize(mEnv->GetArrayLength(mArray)) {}
		@@ -114,6 +110,11 @@ public:
		static bool writeTo(void* data, uint32_t offset, uint32_t length, void* clientData) {
		return static_cast<JavaArrayWriter*>(clientData)->write(data, offset, length);
		}

		private:
		JNIEnv* mEnv;
		jbyteArray mArray;
		jsize mSize;
		};

		}
		@@ -362,7 +363,7 @@ android_mtp_MtpDevice_get_partial_object(JNIEnv *env,
		jint size,
		jbyteArray array)
		{
		if (array == nullptr) {
		if (!array) {
		jniThrowException(env, "java/lang/IllegalArgumentException", "Array must not be null.");
		return -1;
		}