Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8e5a0d7d authored by Narayan Kamath's avatar Narayan Kamath Committed by android-build-merger
Browse files

Merge "close file in PersistentDataBlockService jni" 

am: c71c44a5

* commit 'c71c44a5':
  close file in PersistentDataBlockService jni
parents a849f1e4 c71c44a5

services/core/jni/com_android_server_PersistentDataBlockService.cpp

+10 −2
Original line number Diff line number Diff line
@@ -84,7 +84,11 @@ namespace android { 
        if (fd < 0)

            return 0;



        return get_block_device_size(fd);

        const uint64_t size = get_block_device_size(fd);



        close(fd);



        return size;

    }



    static int com_android_server_PersistentDataBlockService_wipe(JNIEnv *env, jclass, jstring jpath) {
@@ -94,7 +98,11 @@ namespace android { 
        if (fd < 0)

            return 0;



        return wipe_block_device(fd);

        const int ret = wipe_block_device(fd);



        close(fd);



        return ret;

    }



    static const JNINativeMethod sMethods[] = {