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

Commit 205a6809 authored by Kevin DuBois's avatar Kevin DuBois
Browse files

framework: fix setDisplayContentSamplingEnabled rc 

Return code was documented as true-as-success, but test
was implemented as false-for-success. Correct code so the
doc is correct.

Test: atest FrameworksServicesTests:DisplayManagerServiceTest
Change-Id: Ifc1ecda24735b64942090527866d19d6f75cda8b
Fixes: 122483211
parent 018edf2c

core/jni/android_view_SurfaceControl.cpp

+2 −1
Original line number Diff line number Diff line
@@ -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,

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

+1 −1
Original line number Diff line number Diff line
@@ -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);