From 205a6809e107a9a2208bb6918cc19e1cab2c4675 Mon Sep 17 00:00:00 2001 From: Kevin DuBois Date: Mon, 7 Jan 2019 17:04:46 -0800 Subject: 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 --- core/jni/android_view_SurfaceControl.cpp | 3 ++- .../src/com/android/server/display/DisplayManagerServiceTest.java | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/core/jni/android_view_SurfaceControl.cpp b/core/jni/android_view_SurfaceControl.cpp index 6a4b633df6a2..f292d25c15fe 100644 --- a/core/jni/android_view_SurfaceControl.cpp +++ b/core/jni/android_view_SurfaceControl.cpp @@ -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 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, diff --git a/services/tests/servicestests/src/com/android/server/display/DisplayManagerServiceTest.java b/services/tests/servicestests/src/com/android/server/display/DisplayManagerServiceTest.java index abf90402250c..4742a73b17a8 100644 --- a/services/tests/servicestests/src/com/android/server/display/DisplayManagerServiceTest.java +++ b/services/tests/servicestests/src/com/android/server/display/DisplayManagerServiceTest.java @@ -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); -- cgit v1.2.3-59-g8ed1b