summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert Carr <racarr@google.com>2019-04-09 14:42:02 (GMT)
committerandroid-build-team Robot <android-build-team-robot@google.com>2019-06-11 21:04:29 (GMT)
commita595bca273810f976da934f611c56546876ccc03 (patch)
tree5297bd9d4805d3f7bb69270242dc624c8b66d2c5
parent3bdb6f51b683a7869e9e4065a552fc106d462d9e (diff)
downloadframeworks_base-a595bca273810f976da934f611c56546876ccc03.zip
frameworks_base-a595bca273810f976da934f611c56546876ccc03.tar.gz
frameworks_base-a595bca273810f976da934f611c56546876ccc03.tar.bz2
DO NOT MERGE SurfaceControl: Fix captureLayers JNI
Missed a call-point in last refactoring. This CL should have been included in https://googleplex-android-review.git.corp.google.com/q/topic:%22bp-secure-screen-rotation%22+(status:open%20OR%20status:merged) Bug: 130211665 Bug: 133054270 Test: Manual Change-Id: I43fa93eea7d79f5b773497e3bb65750866eca2cb (cherry picked from commit bf9298f1c9b848ff0db4ae0be3913ad531bafa9e) (cherry picked from commit fbc22c2b6d54a8a9b589746be67d3992f01212cc)
-rw-r--r--core/jni/android_view_SurfaceControl.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/core/jni/android_view_SurfaceControl.cpp b/core/jni/android_view_SurfaceControl.cpp
index 614a8ff..04b0609 100644
--- a/core/jni/android_view_SurfaceControl.cpp
+++ b/core/jni/android_view_SurfaceControl.cpp
@@ -308,7 +308,8 @@ static jobject nativeCaptureLayers(JNIEnv* env, jclass clazz, jobject layerHandl
buffer->getHeight(),
buffer->getPixelFormat(),
(jint)buffer->getUsage(),
- (jlong)buffer.get());
+ (jlong)buffer.get(),
+ false /* capturedSecureLayers */);
}
static void nativeApplyTransaction(JNIEnv* env, jclass clazz, jlong transactionObj, jboolean sync) {