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

Merge "VintfObject: DisabledChecks -> CheckFlags."

Browse Source
This commit is contained in:
Yifan Hong
2018-08-09 18:32:05 +00:00
committed by Gerrit Code Review
parent e8465e8480 65d1bd15fe
commit c4ee8133d1
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
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::DisabledChecks checks) { static jint verify(JNIEnv* env, jobjectArray packageInfo, android::vintf::CheckFlags::Type checks) {
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);
@@ -116,11 +116,11 @@ static jint verify(JNIEnv* env, jobjectArray packageInfo, android::vintf::Disabl
} }
static jint android_os_VintfObject_verify(JNIEnv* env, jclass, jobjectArray packageInfo) { static jint android_os_VintfObject_verify(JNIEnv* env, jclass, jobjectArray packageInfo) {
return verify(env, packageInfo, ::android::vintf::ENABLE_ALL_CHECKS); 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::DISABLE_AVB_CHECK); return verify(env, nullptr, ::android::vintf::CheckFlags::DISABLE_AVB_CHECK);
} }
static jobjectArray android_os_VintfObject_getHalNamesAndVersions(JNIEnv* env, jclass) { static jobjectArray android_os_VintfObject_getHalNamesAndVersions(JNIEnv* env, jclass) {