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

Merge "framework: fix setDisplayContentSamplingEnabled rc"

Browse Source
This commit is contained in:
Kevin DuBois
2019-01-08 16:57:03 +00:00
committed by Android (Google) Code Review
parent cb577bca43 205a6809e1
commit df8fdf4e3f
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/jni/android_view_SurfaceControl.cpp
View File

@@ -438,8 +438,9 @@ static jobject nativeGetDisplayedContentSamplingAttributes(JNIEnv* env, jclass c
static jboolean nativeSetDisplayedContentSamplingEnabled(JNIEnv* env, jclass clazz,
jobject tokenObj, jboolean enable, jint componentMask, jint maxFrames) {
sp<IBinder> token(ibinderForJavaObject(env, tokenObj));
return SurfaceComposerClient::setDisplayContentSamplingEnabled(
status_t rc = SurfaceComposerClient::setDisplayContentSamplingEnabled(
token, enable, componentMask, maxFrames);
return rc == OK;
}
static jobject nativeGetDisplayedContentSample(JNIEnv* env, jclass clazz, jobject tokenObj,

2
services/tests/servicestests/src/com/android/server/display/DisplayManagerServiceTest.java
View File

@@ -389,7 +389,7 @@ public class DisplayManagerServiceTest {
if (attr == null) return; //sampling not supported on device, skip remainder of test.
boolean enabled = displayManager.setDisplayedContentSamplingEnabledInternal(0, true, 0, 0);
assertTrue(!enabled);
assertTrue(enabled);
displayManager.setDisplayedContentSamplingEnabledInternal(0, false, 0, 0);
DisplayedContentSample sample = displayManager.getDisplayedContentSampleInternal(0, 0, 0);