Add NonNull and Nullable annotations to MtpDevice.

BUG=26758882

Change-Id: I5fa7130b671c71aefca848c109bf37389f57b9da

1 files changed, 2 insertions, 2 deletions

diff --git a/media/jni/android_mtp_MtpDevice.cpp b/media/jni/android_mtp_MtpDevice.cpp
index 1faa0c472b2e..8bcc85f7155b 100644
--- a/media/jni/android_mtp_MtpDevice.cpp
+++ b/media/jni/android_mtp_MtpDevice.cpp
@@ -601,12 +601,12 @@ android_mtp_MtpDevice_send_object_info(JNIEnv *env, jobject thiz, jobject info)
 {
     MtpDevice* device = get_device_from_object(env, thiz);
     if (!device) {
-        return JNI_FALSE;
+        return NULL;
     }
 
     // Updating existing objects is not supported.
     if (env->GetIntField(info, field_objectInfo_handle) != -1) {
-        return JNI_FALSE;
+        return NULL;
     }
 
     MtpObjectInfo* object_info = new MtpObjectInfo(-1);