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

Commit b5c30800 authored by John Reck's avatar John Reck Committed by Android (Google) Code Review
Browse files

Merge "Add API to copy a window"

parents 74784e8e 9580146f

api/current.txt

+4 −0
Original line number Diff line number Diff line
@@ -42156,7 +42156,11 @@ package android.view { 














  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.SurfaceView, android.graphics.Rect, 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);













    method public static void request(android.view.Surface, android.graphics.Rect, android.graphics.Bitmap, android.view.PixelCopy.OnPixelCopyFinishedListener, android.os.Handler);













    method public static void request(android.view.Window, android.graphics.Bitmap, android.view.PixelCopy.OnPixelCopyFinishedListener, android.os.Handler);













    method public static void request(android.view.Window, android.graphics.Rect, 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

























api/system-current.txt



+4
−0




























Original line number
Diff line number
Diff line








@@ -45327,7 +45327,11 @@ package android.view {



























  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.SurfaceView, android.graphics.Rect, 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);













    method public static void request(android.view.Surface, android.graphics.Rect, android.graphics.Bitmap, android.view.PixelCopy.OnPixelCopyFinishedListener, android.os.Handler);













    method public static void request(android.view.Window, android.graphics.Bitmap, android.view.PixelCopy.OnPixelCopyFinishedListener, android.os.Handler);













    method public static void request(android.view.Window, android.graphics.Rect, 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

























api/test-current.txt



+4
−0




























Original line number
Diff line number
Diff line








@@ -42239,7 +42239,11 @@ package android.view {



























  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.SurfaceView, android.graphics.Rect, 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);













    method public static void request(android.view.Surface, android.graphics.Rect, android.graphics.Bitmap, android.view.PixelCopy.OnPixelCopyFinishedListener, android.os.Handler);













    method public static void request(android.view.Window, android.graphics.Bitmap, android.view.PixelCopy.OnPixelCopyFinishedListener, android.os.Handler);













    method public static void request(android.view.Window, android.graphics.Rect, 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

























core/java/android/view/ThreadedRenderer.java



+10
−3




























Original line number
Diff line number
Diff line








@@ -883,8 +883,14 @@ public final class ThreadedRenderer {













        nSerializeDisplayListTree(mNativeProxy);















    }





























    public static int copySurfaceInto(Surface surface, Bitmap bitmap) {













        return nCopySurfaceInto(surface, bitmap);













    public static int copySurfaceInto(Surface surface, Rect srcRect, Bitmap bitmap) {













        if (srcRect == null) {













            // Empty rect means entire surface













            return nCopySurfaceInto(surface, 0, 0, 0, 0, bitmap);













        } else {













            return nCopySurfaceInto(surface, srcRect.left, srcRect.top,













                    srcRect.right, srcRect.bottom, bitmap);













        }















    }































    @Override










@@ -1036,5 +1042,6 @@ 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 int nCopySurfaceInto(Surface surface, Bitmap bitmap);













    private static native int nCopySurfaceInto(Surface surface,













            int srcLeft, int srcTop, int srcRight, int srcBottom, Bitmap bitmap);















}
























core/jni/android_view_ThreadedRenderer.cpp



+4
−3




























Original line number
Diff line number
Diff line








@@ -899,11 +899,12 @@ static void android_view_ThreadedRenderer_setContentDrawBounds(JNIEnv* env,













}































static jint android_view_ThreadedRenderer_copySurfaceInto(JNIEnv* env,













        jobject clazz, jobject jsurface, jobject jbitmap) {













        jobject clazz, jobject jsurface, jint left, jint top,













        jint right, jint bottom, jobject jbitmap) {















    SkBitmap bitmap;















    GraphicsJNI::getSkBitmap(env, jbitmap, &bitmap);















    sp<Surface> surface = android_view_Surface_getSurface(env, jsurface);













    return RenderProxy::copySurfaceInto(surface, &bitmap);













    return RenderProxy::copySurfaceInto(surface, left, top, right, bottom, &bitmap);















}































// ----------------------------------------------------------------------------










@@ -1001,7 +1002,7 @@ static const JNINativeMethod gMethods[] = {













    { "nRemoveFrameMetricsObserver",















            "(JJ)V",















            (void*)android_view_ThreadedRenderer_removeFrameMetricsObserver },













    { "nCopySurfaceInto", "(Landroid/view/Surface;Landroid/graphics/Bitmap;)I",













    { "nCopySurfaceInto", "(Landroid/view/Surface;IIIILandroid/graphics/Bitmap;)I",















                (void*)android_view_ThreadedRenderer_copySurfaceInto },















};