Merge "Add android.os.VintfRuntimeInfo" am: 4f8a375958 am: e0bf06dd9e (6196ab62) · Commits · e / os / android_frameworks_base

core/java/android/os/VintfRuntimeInfo.java

0 → 100644

+70 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2017 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package android.os;

		/**
		* Java API for ::android::vintf::RuntimeInfo. Methods return null / 0 on any error.
		*
		* @hide
		*/
		public class VintfRuntimeInfo {

		private VintfRuntimeInfo() {}

		/**
		* @return /sys/fs/selinux/policyvers, via security_policyvers() native call
		*/
		public static native long getKernelSepolicyVersion();
		/**
		* @return content of /proc/cpuinfo
		*/
		public static native String getCpuInfo();
		/**
		* @return os name extracted from uname() native call
		*/
		public static native String getOsName();
		/**
		* @return node name extracted from uname() native call
		*/
		public static native String getNodeName();
		/**
		* @return os release extracted from uname() native call
		*/
		public static native String getOsRelease();
		/**
		* @return os version extracted from uname() native call
		*/
		public static native String getOsVersion();
		/**
		* @return hardware id extracted from uname() native call
		*/
		public static native String getHardwareId();
		/**
		* @return kernel version extracted from uname() native call. Format is
		* {@code x.y.z}.
		*/
		public static native String getKernelVersion();
		/**
		* @return libavb version in OS. Format is {@code x.y}.
		*/
		public static native String getBootAvbVersion();
		/**
		* @return libavb version in bootloader. Format is {@code x.y}.
		*/
		public static native String getBootVbmetaAvbVersion();

		}

core/jni/Android.mk

+1 −0

Original line number	Diff line number	Diff line
		@@ -97,6 +97,7 @@ LOCAL_SRC_FILES:= \
		android_os_Trace.cpp \
		android_os_UEventObserver.cpp \
		android_os_VintfObject.cpp \
		android_os_VintfRuntimeInfo.cpp \
		android_net_LocalSocketImpl.cpp \
		android_net_NetUtils.cpp \
		android_net_TrafficStats.cpp \

core/jni/AndroidRuntime.cpp

+2 −0

Original line number	Diff line number	Diff line
		@@ -160,6 +160,7 @@ extern int register_android_os_MessageQueue(JNIEnv* env);
		extern int register_android_os_Parcel(JNIEnv* env);
		extern int register_android_os_SELinux(JNIEnv* env);
		extern int register_android_os_VintfObject(JNIEnv *env);
		extern int register_android_os_VintfRuntimeInfo(JNIEnv *env);
		extern int register_android_os_seccomp(JNIEnv* env);
		extern int register_android_os_SystemProperties(JNIEnv *env);
		extern int register_android_os_SystemClock(JNIEnv* env);
		@@ -1310,6 +1311,7 @@ static const RegJNIRec gRegJNI[] = {
		REG_JNI(register_android_os_HwParcel),
		REG_JNI(register_android_os_HwRemoteBinder),
		REG_JNI(register_android_os_VintfObject),
		REG_JNI(register_android_os_VintfRuntimeInfo),
		REG_JNI(register_android_nio_utils),
		REG_JNI(register_android_graphics_Canvas),
		REG_JNI(register_android_graphics_Graphics),

core/jni/android_os_VintfRuntimeInfo.cpp

0 → 100644

+80 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2017 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		#define LOG_TAG "VintfRuntimeInfo"
		//#define LOG_NDEBUG 0

		#include <JNIHelp.h>
		#include <vintf/VintfObject.h>
		#include <vintf/parse_string.h>
		#include <vintf/parse_xml.h>

		#include "core_jni_helpers.h"

		namespace android {

		using vintf::RuntimeInfo;
		using vintf::VintfObject;

		#define MAP_STRING_METHOD(javaMethod, cppString) \
		static jstring android_os_VintfRuntimeInfo_##javaMethod(JNIEnv* env, jclass clazz) \
		{ \
		const RuntimeInfo *info = VintfObject::GetRuntimeInfo(); \
		if (info == nullptr) return nullptr; \
		return env->NewStringUTF((cppString).c_str()); \
		} \

		MAP_STRING_METHOD(getCpuInfo, info->cpuInfo());
		MAP_STRING_METHOD(getOsName, info->osName());
		MAP_STRING_METHOD(getNodeName, info->nodeName());
		MAP_STRING_METHOD(getOsRelease, info->osRelease());
		MAP_STRING_METHOD(getOsVersion, info->osVersion());
		MAP_STRING_METHOD(getHardwareId, info->hardwareId());
		MAP_STRING_METHOD(getKernelVersion, vintf::to_string(info->kernelVersion()));
		MAP_STRING_METHOD(getBootAvbVersion, vintf::to_string(info->bootAvbVersion()));
		MAP_STRING_METHOD(getBootVbmetaAvbVersion, vintf::to_string(info->bootVbmetaAvbVersion()));


		static jlong android_os_VintfRuntimeInfo_getKernelSepolicyVersion(JNIEnv *env, jclass clazz)
		{
		const RuntimeInfo *info = VintfObject::GetRuntimeInfo();
		if (info == nullptr) return 0;
		return static_cast<jlong>(info->kernelSepolicyVersion());
		}

		// ----------------------------------------------------------------------------

		static const JNINativeMethod gVintfRuntimeInfoMethods[] = {
		{"getKernelSepolicyVersion", "()J", (void*)android_os_VintfRuntimeInfo_getKernelSepolicyVersion},
		{"getCpuInfo", "()Ljava/lang/String;", (void*)android_os_VintfRuntimeInfo_getCpuInfo},
		{"getOsName", "()Ljava/lang/String;", (void*)android_os_VintfRuntimeInfo_getOsName},
		{"getNodeName", "()Ljava/lang/String;", (void*)android_os_VintfRuntimeInfo_getNodeName},
		{"getOsRelease", "()Ljava/lang/String;", (void*)android_os_VintfRuntimeInfo_getOsRelease},
		{"getOsVersion", "()Ljava/lang/String;", (void*)android_os_VintfRuntimeInfo_getOsVersion},
		{"getHardwareId", "()Ljava/lang/String;", (void*)android_os_VintfRuntimeInfo_getHardwareId},
		{"getKernelVersion", "()Ljava/lang/String;", (void*)android_os_VintfRuntimeInfo_getKernelVersion},
		{"getBootAvbVersion", "()Ljava/lang/String;", (void*)android_os_VintfRuntimeInfo_getBootAvbVersion},
		{"getBootVbmetaAvbVersion", "()Ljava/lang/String;", (void*)android_os_VintfRuntimeInfo_getBootVbmetaAvbVersion},
		};

		const char* const kVintfRuntimeInfoPathName = "android/os/VintfRuntimeInfo";

		int register_android_os_VintfRuntimeInfo(JNIEnv* env)
		{
		return RegisterMethodsOrDie(env, kVintfRuntimeInfoPathName, gVintfRuntimeInfoMethods, NELEM(gVintfRuntimeInfoMethods));
		}

		};