Merge "API tweaks to PixelCopy and make it public" into nyc-dev (7f209d37) · Commits · e / os / android_frameworks_base

api/current.txt

+15 −0

Original line number	Diff line number	Diff line
		@@ -42049,6 +42049,21 @@ package android.view {
		field public static final int ORIENTATION_UNKNOWN = -1; // 0xffffffff
		}

		public final class PixelCopy {
		method public static void request(android.view.SurfaceView, android.graphics.Bitmap, android.view.PixelCopy.OnPixelCopyFinishedListener, android.os.Handler);
		method public static void request(android.view.Surface, android.graphics.Bitmap, android.view.PixelCopy.OnPixelCopyFinishedListener, android.os.Handler);
		field public static final int ERROR_DESTINATION_INVALID = 5; // 0x5
		field public static final int ERROR_SOURCE_INVALID = 4; // 0x4
		field public static final int ERROR_SOURCE_NO_DATA = 3; // 0x3
		field public static final int ERROR_TIMEOUT = 2; // 0x2
		field public static final int ERROR_UNKNOWN = 1; // 0x1
		field public static final int SUCCESS = 0; // 0x0
		}

		public static abstract interface PixelCopy.OnPixelCopyFinishedListener {
		method public abstract void onPixelCopyFinished(int);
		}

		public final class PointerIcon implements android.os.Parcelable {
		method public static android.view.PointerIcon createCustomIcon(android.graphics.Bitmap, float, float);
		method public int describeContents();

+15 −0

Original line number	Diff line number	Diff line
		@@ -45039,6 +45039,21 @@ package android.view {
		field public static final int ORIENTATION_UNKNOWN = -1; // 0xffffffff
		}

		public final class PixelCopy {
		method public static void request(android.view.SurfaceView, android.graphics.Bitmap, android.view.PixelCopy.OnPixelCopyFinishedListener, android.os.Handler);
		method public static void request(android.view.Surface, android.graphics.Bitmap, android.view.PixelCopy.OnPixelCopyFinishedListener, android.os.Handler);
		field public static final int ERROR_DESTINATION_INVALID = 5; // 0x5
		field public static final int ERROR_SOURCE_INVALID = 4; // 0x4
		field public static final int ERROR_SOURCE_NO_DATA = 3; // 0x3
		field public static final int ERROR_TIMEOUT = 2; // 0x2
		field public static final int ERROR_UNKNOWN = 1; // 0x1
		field public static final int SUCCESS = 0; // 0x0
		}

		public static abstract interface PixelCopy.OnPixelCopyFinishedListener {
		method public abstract void onPixelCopyFinished(int);
		}

		public final class PointerIcon implements android.os.Parcelable {
		method public static android.view.PointerIcon createCustomIcon(android.graphics.Bitmap, float, float);
		method public int describeContents();

+15 −0

Original line number	Diff line number	Diff line
		@@ -42127,6 +42127,21 @@ package android.view {
		field public static final int ORIENTATION_UNKNOWN = -1; // 0xffffffff
		}

		public final class PixelCopy {
		method public static void request(android.view.SurfaceView, android.graphics.Bitmap, android.view.PixelCopy.OnPixelCopyFinishedListener, android.os.Handler);
		method public static void request(android.view.Surface, android.graphics.Bitmap, android.view.PixelCopy.OnPixelCopyFinishedListener, android.os.Handler);
		field public static final int ERROR_DESTINATION_INVALID = 5; // 0x5
		field public static final int ERROR_SOURCE_INVALID = 4; // 0x4
		field public static final int ERROR_SOURCE_NO_DATA = 3; // 0x3
		field public static final int ERROR_TIMEOUT = 2; // 0x2
		field public static final int ERROR_UNKNOWN = 1; // 0x1
		field public static final int SUCCESS = 0; // 0x0
		}

		public static abstract interface PixelCopy.OnPixelCopyFinishedListener {
		method public abstract void onPixelCopyFinished(int);
		}

		public final class PointerIcon implements android.os.Parcelable {
		method public static android.view.PointerIcon createCustomIcon(android.graphics.Bitmap, float, float);
		method public int describeContents();

+2 −2

Original line number	Diff line number	Diff line
		@@ -909,7 +909,7 @@ public final class ThreadedRenderer {
		nSerializeDisplayListTree(mNativeProxy);
		}

		public static boolean copySurfaceInto(Surface surface, Bitmap bitmap) {
		public static int copySurfaceInto(Surface surface, Bitmap bitmap) {
		return nCopySurfaceInto(surface, bitmap);
		}

		@@ -1051,5 +1051,5 @@ public final class ThreadedRenderer {
		private static native long nAddFrameMetricsObserver(long nativeProxy, FrameMetricsObserver observer);
		private static native void nRemoveFrameMetricsObserver(long nativeProxy, long nativeObserver);

		private static native boolean nCopySurfaceInto(Surface surface, Bitmap bitmap);
		private static native int nCopySurfaceInto(Surface surface, Bitmap bitmap);
		}

+2 −2

Original line number	Diff line number	Diff line
		@@ -669,7 +669,7 @@ static void android_view_ThreadedRenderer_setContentDrawBounds(JNIEnv* env,
		proxy->setContentDrawBounds(left, top, right, bottom);
		}

		static jboolean android_view_ThreadedRenderer_copySurfaceInto(JNIEnv* env,
		static jint android_view_ThreadedRenderer_copySurfaceInto(JNIEnv* env,
		jobject clazz, jobject jsurface, jobject jbitmap) {
		SkBitmap bitmap;
		GraphicsJNI::getSkBitmap(env, jbitmap, &bitmap);
		@@ -783,7 +783,7 @@ static const JNINativeMethod gMethods[] = {
		{ "nRemoveFrameMetricsObserver",
		"(JJ)V",
		(void*)android_view_ThreadedRenderer_removeFrameMetricsObserver },
		{ "nCopySurfaceInto", "(Landroid/view/Surface;Landroid/graphics/Bitmap;)Z",
		{ "nCopySurfaceInto", "(Landroid/view/Surface;Landroid/graphics/Bitmap;)I",
		(void*)android_view_ThreadedRenderer_copySurfaceInto },
		};