Merge "Close channel that underlies a file lock" into main

import java.io.FileInputStream;

import java.io.IOException;

import java.io.InputStream;

import java.nio.channels.Channel;

import java.nio.channels.FileChannel;

import java.nio.channels.FileLock;

import java.nio.charset.StandardCharsets;

        // Lock the directory from access by other JVMs

        try {

            if (!mLockFile.exists()) {

                mLockFile.getParentFile().mkdirs();

                mLockFile.createNewFile();

            }

            mJvmLock = FileChannel.open(mLockFile.toPath(), StandardOpenOption.WRITE).lock();

        } catch (IOException e) {

            Slog.e(TAG, "Cannot lock snapshot directory", e);

    private void unlockStoreDirectory() {

        try {

            mJvmLock.close();

            Channel channel = mJvmLock.acquiredBy();

            mJvmLock.release();

            channel.close();

        } catch (IOException e) {

            Slog.e(TAG, "Cannot unlock snapshot directory", e);

        } finally {

            mJvmLock = null;

            mFileLock.unlock();

        }

    }