Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Force pending transactions to flush before screenshot." into nyc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2016-05-25 19:16:12 +00:00
committed by Android (Google) Code Review
parent 7c17e70f2f e9953b1752
commit 39e8022a75
3 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/java/android/view/SurfaceControl.java
View File

@@ -46,7 +46,7 @@ public class SurfaceControl {
boolean allLayers, boolean useIdentityTransform); boolean allLayers, boolean useIdentityTransform);
private static native void nativeOpenTransaction(); private static native void nativeOpenTransaction();
private static native void nativeCloseTransaction(); private static native void nativeCloseTransaction(boolean sync);
private static native void nativeSetAnimationTransaction(); private static native void nativeSetAnimationTransaction();
private static native void nativeSetLayer(long nativeObject, int zorder); private static native void nativeSetLayer(long nativeObject, int zorder);
@@ -372,7 +372,11 @@ public class SurfaceControl {
/** end a transaction */ /** end a transaction */
public static void closeTransaction() { public static void closeTransaction() {
nativeCloseTransaction(); nativeCloseTransaction(false);
}
public static void closeTransactionSync() {
nativeCloseTransaction(true);
} }
public void deferTransactionUntil(IBinder handle, long frame) { public void deferTransactionUntil(IBinder handle, long frame) {

7
core/jni/android_view_SurfaceControl.cpp
View File

@@ -223,8 +223,9 @@ static void nativeOpenTransaction(JNIEnv* env, jclass clazz) {
SurfaceComposerClient::openGlobalTransaction(); SurfaceComposerClient::openGlobalTransaction();
} }
static void nativeCloseTransaction(JNIEnv* env, jclass clazz) {
SurfaceComposerClient::closeGlobalTransaction(); static void nativeCloseTransaction(JNIEnv* env, jclass clazz, jboolean sync) {
SurfaceComposerClient::closeGlobalTransaction(sync);
} }
static void nativeSetAnimationTransaction(JNIEnv* env, jclass clazz) { static void nativeSetAnimationTransaction(JNIEnv* env, jclass clazz) {
@@ -649,7 +650,7 @@ static const JNINativeMethod sSurfaceControlMethods[] = {
(void*)nativeScreenshot }, (void*)nativeScreenshot },
{"nativeOpenTransaction", "()V", {"nativeOpenTransaction", "()V",
(void*)nativeOpenTransaction }, (void*)nativeOpenTransaction },
{"nativeCloseTransaction", "()V", {"nativeCloseTransaction", "(Z)V",
(void*)nativeCloseTransaction }, (void*)nativeCloseTransaction },
{"nativeSetAnimationTransaction", "()V", {"nativeSetAnimationTransaction", "()V",
(void*)nativeSetAnimationTransaction }, (void*)nativeSetAnimationTransaction },

5
services/core/java/com/android/server/wm/WindowManagerService.java
View File

@@ -6386,6 +6386,11 @@ public class WindowManagerService extends IWindowManager.Stub
if (DEBUG_SCREENSHOT && inRotation) Slog.v(TAG_WM, if (DEBUG_SCREENSHOT && inRotation) Slog.v(TAG_WM,
"Taking screenshot while rotating"); "Taking screenshot while rotating");
// We force pending transactions to flush before taking
// the screenshot by pushing an empty synchronous transaction.
SurfaceControl.openTransaction();
SurfaceControl.closeTransactionSync();
bm = SurfaceControl.screenshot(crop, width, height, minLayer, maxLayer, bm = SurfaceControl.screenshot(crop, width, height, minLayer, maxLayer,
inRotation, rot); inRotation, rot);
if (bm == null) { if (bm == null) {