Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Use default argument for VintfObject::CheckCompatibility."

Browse Source 
am: 0296deccca

Change-Id: I6d23d6d7e9c4c29483ae927be7df4e4b7bc7a6d3
This commit is contained in:
Yifan Hong
2019-01-30 13:30:50 -08:00
committed by android-build-merger
parent 16dd167de0 0296deccca
commit 976ef7e600
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
core/jni/android_os_VintfObject.cpp
View File

@@ -96,7 +96,7 @@ static jobjectArray android_os_VintfObject_report(JNIEnv* env, jclass)
return toJavaStringArray(env, cStrings); return toJavaStringArray(env, cStrings);
} }
static jint verify(JNIEnv* env, jobjectArray packageInfo, android::vintf::CheckFlags::Type checks) { static jint android_os_VintfObject_verify(JNIEnv* env, jclass, jobjectArray packageInfo) {
std::vector<std::string> cPackageInfo; std::vector<std::string> cPackageInfo;
if (packageInfo) { if (packageInfo) {
size_t count = env->GetArrayLength(packageInfo); size_t count = env->GetArrayLength(packageInfo);
@@ -109,18 +109,19 @@ static jint verify(JNIEnv* env, jobjectArray packageInfo, android::vintf::CheckF
} }
} }
std::string error; std::string error;
int32_t status = VintfObject::CheckCompatibility(cPackageInfo, &error, checks); int32_t status = VintfObject::CheckCompatibility(cPackageInfo, &error);
if (status) if (status)
LOG(WARNING) << "VintfObject.verify() returns " << status << ": " << error; LOG(WARNING) << "VintfObject.verify() returns " << status << ": " << error;
return status; return status;
} }
static jint android_os_VintfObject_verify(JNIEnv* env, jclass, jobjectArray packageInfo) {
return verify(env, packageInfo, ::android::vintf::CheckFlags::ENABLE_ALL_CHECKS);
}
static jint android_os_VintfObject_verifyWithoutAvb(JNIEnv* env, jclass) { static jint android_os_VintfObject_verifyWithoutAvb(JNIEnv* env, jclass) {
return verify(env, nullptr, ::android::vintf::CheckFlags::DISABLE_AVB_CHECK); std::string error;
int32_t status = VintfObject::CheckCompatibility({}, &error,
::android::vintf::CheckFlags::DISABLE_AVB_CHECK);
if (status)
LOG(WARNING) << "VintfObject.verifyWithoutAvb() returns " << status << ": " << error;
return status;
} }
static jobjectArray android_os_VintfObject_getHalNamesAndVersions(JNIEnv* env, jclass) { static jobjectArray android_os_VintfObject_getHalNamesAndVersions(JNIEnv* env, jclass) {