summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Yifan Hong <elsk@google.com> 2017-07-06 20:32:39 +0000
committer android-build-merger <android-build-merger@google.com> 2017-07-06 20:32:39 +0000
commit7f0814cec3e46f80e5af030072bf4d373fd5015b (patch)
treebbf48d5b9793f49f39974716ebd788e0bdb1e65d
parent5e69a2a8c48def861b6ec82444226ed61ea6aad7 (diff)
parent429b739ff585f703504ceb28e6483b7707382b63 (diff)
Merge "Log errors on android.os.VintfObject.verify()" am: 54b1e9c57c am: 90a5fd0549
am: 429b739ff5 Change-Id: I446eba3137fc7077d7512d6e8b27a2f05a0bb281
-rw-r--r--core/jni/android_os_VintfObject.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/core/jni/android_os_VintfObject.cpp b/core/jni/android_os_VintfObject.cpp
index fa9379ee2075..8b4cc91565b6 100644
--- a/core/jni/android_os_VintfObject.cpp
+++ b/core/jni/android_os_VintfObject.cpp
@@ -102,7 +102,10 @@ static jint android_os_VintfObject_verify(JNIEnv* env, jclass, jobjectArray pack
cPackageInfo[i] = cString;
env->ReleaseStringUTFChars(element, cString);
}
- int32_t status = VintfObject::CheckCompatibility(cPackageInfo);
+ std::string error;
+ int32_t status = VintfObject::CheckCompatibility(cPackageInfo, &error);
+ if (status)
+ LOG(WARNING) << "VintfObject.verify() returns " << status << ": " << error;
return status;
}