Merge "clang-format com_android_server_pdb_PersistentDataBlockService.cpp" into main (634d4325) · Commits · e / os / android_frameworks_base

services/core/jni/com_android_server_pdb_PersistentDataBlockService.cpp

+63 −70

Original line number	Diff line number	Diff line
		@@ -15,38 +15,32 @@
		*/

		#include <android_runtime/AndroidRuntime.h>
		#include <nativehelper/JNIHelp.h>
		#include <errno.h>
		#include <fcntl.h>
		#include <inttypes.h>
		#include <jni.h>
		#include <nativehelper/JNIHelp.h>
		#include <nativehelper/ScopedUtfChars.h>

		#include <utils/misc.h>
		#include <string.h>
		#include <sys/ioctl.h>
		#include <sys/mount.h>
		#include <utils/Log.h>


		#include <inttypes.h>
		#include <fcntl.h>
		#include <errno.h>
		#include <string.h>
		#include <utils/misc.h>

		namespace android {

		uint64_t get_block_device_size(int fd)
		{
		uint64_t get_block_device_size(int fd) {
		uint64_t size = 0;
		int ret;

		ret = ioctl(fd, BLKGETSIZE64, &size);

		if (ret)
		return 0;
		if (ret) return 0;

		return size;
		}

		int wipe_block_device(int fd)
		{
		int wipe_block_device(int fd) {
		uint64_t range[2];
		int ret;
		uint64_t len = get_block_device_size(fd);
		@@ -54,8 +48,7 @@ namespace android {
		range[0] = 0;
		range[1] = len;

		if (range[1] == 0)
		return 0;
		if (range[1] == 0) return 0;

		ret = ioctl(fd, BLKSECDISCARD, &range);
		if (ret < 0) {
		@@ -70,19 +63,18 @@ namespace android {
		ALOGE("Wipe via secure discard failed, used non-secure discard instead\n");
		return 0;
		}

		}

		return ret;
		}

		static jlong com_android_server_pdb_PersistentDataBlockService_getBlockDeviceSize(JNIEnv *env, jclass, jstring jpath)
		{
		static jlong com_android_server_pdb_PersistentDataBlockService_getBlockDeviceSize(JNIEnv *env,
		jclass,
		jstring jpath) {
		ScopedUtfChars path(env, jpath);
		int fd = open(path.c_str(), O_RDONLY);

		if (fd < 0)
		return 0;
		if (fd < 0) return 0;

		const uint64_t size = get_block_device_size(fd);

		@@ -91,12 +83,12 @@ namespace android {
		return size;
		}

		static int com_android_server_pdb_PersistentDataBlockService_wipe(JNIEnv *env, jclass, jstring jpath) {
		static int com_android_server_pdb_PersistentDataBlockService_wipe(JNIEnv *env, jclass,
		jstring jpath) {
		ScopedUtfChars path(env, jpath);
		int fd = open(path.c_str(), O_WRONLY);

		if (fd < 0)
		return 0;
		if (fd < 0) return 0;

		const int ret = wipe_block_device(fd);

		@@ -107,12 +99,13 @@ namespace android {

		static const JNINativeMethod sMethods[] = {
		/* name, signature, funcPtr */
		{"nativeGetBlockDeviceSize", "(Ljava/lang/String;)J", (void*)com_android_server_pdb_PersistentDataBlockService_getBlockDeviceSize},
		{"nativeWipe", "(Ljava/lang/String;)I", (void*)com_android_server_pdb_PersistentDataBlockService_wipe},
		{"nativeGetBlockDeviceSize", "(Ljava/lang/String;)J",
		(void *)com_android_server_pdb_PersistentDataBlockService_getBlockDeviceSize},
		{"nativeWipe", "(Ljava/lang/String;)I",
		(void *)com_android_server_pdb_PersistentDataBlockService_wipe},
		};

		int register_android_server_pdb_PersistentDataBlockService(JNIEnv* env)
		{
		int register_android_server_pdb_PersistentDataBlockService(JNIEnv *env) {
		return jniRegisterNativeMethods(env, "com/android/server/pdb/PersistentDataBlockService",
		sMethods, NELEM(sMethods));
		}