Merge "Add API to create GestureLibrary from FileDescriptor" (bb021e3b) · Commits · e / os / android_frameworks_base

api/current.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -13460,6 +13460,7 @@ package android.gesture {
		public final class GestureLibraries {
		method public static android.gesture.GestureLibrary fromFile(String);
		method public static android.gesture.GestureLibrary fromFile(java.io.File);
		method @NonNull public static android.gesture.GestureLibrary fromFileDescriptor(@NonNull android.os.ParcelFileDescriptor);
		method public static android.gesture.GestureLibrary fromPrivateFile(android.content.Context, String);
		method public static android.gesture.GestureLibrary fromRawResource(android.content.Context, @RawRes int);
		}

core/java/android/gesture/GestureLibraries.java

+60 −25

Original line number	Diff line number	Diff line
		@@ -16,14 +16,16 @@

		package android.gesture;

		import android.annotation.NonNull;
		import android.annotation.RawRes;
		import android.os.ParcelFileDescriptor;
		import android.util.Log;
		import static android.gesture.GestureConstants.*;
		import android.content.Context;

		import java.io.File;
		import java.io.FileDescriptor;
		import java.io.FileOutputStream;
		import java.io.FileNotFoundException;
		import java.io.IOException;
		import java.io.FileInputStream;
		import java.io.InputStream;
		@@ -41,6 +43,11 @@ public final class GestureLibraries {
		return new FileGestureLibrary(path);
		}

		@NonNull
		public static GestureLibrary fromFileDescriptor(@NonNull ParcelFileDescriptor pfd) {
		return new FileGestureLibrary(pfd.getFileDescriptor());
		}

		public static GestureLibrary fromPrivateFile(Context context, String name) {
		return fromFile(context.getFileStreamPath(name));
		}
		@@ -50,20 +57,37 @@ public final class GestureLibraries {
		}

		private static class FileGestureLibrary extends GestureLibrary {
		// Either a file or an fd is used
		private final File mPath;
		private final FileDescriptor mFd;

		public FileGestureLibrary(File path) {
		mPath = path;
		mFd = null;
		}

		public FileGestureLibrary(FileDescriptor fd) {
		mPath = null;
		mFd = fd;
		}

		/**
		* <p>If this GestureLibrary was created using a FileDescriptor,
		* this method will always return false.
		*/
		@Override
		public boolean isReadOnly() {
		if (mPath != null) {
		return !mPath.canWrite();
		}
		return false;
		}

		public boolean save() {
		if (!mStore.hasChanged()) return true;
		boolean result = false;

		if (mPath != null) {
		final File file = mPath;

		final File parentFile = file.getParentFile();
		@@ -73,34 +97,45 @@ public final class GestureLibraries {
		}
		}

		boolean result = false;
		try {
		//noinspection ResultOfMethodCallIgnored
		file.createNewFile();
		mStore.save(new FileOutputStream(file), true);
		result = true;
		} catch (FileNotFoundException e) {
		Log.d(LOG_TAG, "Could not save the gesture library in " + mPath, e);
		} catch (IOException e) {
		Log.d(LOG_TAG, "Could not save the gesture library in " + mPath, e);
		}

		} else {
		try {
		mStore.save(new FileOutputStream(mFd), true);
		result = true;
		} catch (IOException e) {
		Log.d(LOG_TAG, "Could not save the gesture library", e);
		}
		}
		return result;
		}

		public boolean load() {
		boolean result = false;
		if (mPath != null) {
		final File file = mPath;
		if (file.exists() && file.canRead()) {
		try {
		mStore.load(new FileInputStream(file), true);
		result = true;
		} catch (FileNotFoundException e) {
		Log.d(LOG_TAG, "Could not load the gesture library from " + mPath, e);
		} catch (IOException e) {
		Log.d(LOG_TAG, "Could not load the gesture library from " + mPath, e);
		}
		}
		} else {
		try {
		mStore.load(new FileInputStream(mFd), true);
		result = true;
		} catch (IOException e) {
		Log.d(LOG_TAG, "Could not load the gesture library", e);
		}
		}

		return result;
		}