Moved brightness from Lights to SF.
Test: manual.
Check that brightness works.
Fixes: 111435292
Change-Id: I9351fcc69b3cc217e5eeb7bc3f813a41ba9dc547
diff --git a/core/jni/android_view_SurfaceControl.cpp b/core/jni/android_view_SurfaceControl.cpp
index 89d908b..4a6c72b 100644
--- a/core/jni/android_view_SurfaceControl.cpp
+++ b/core/jni/android_view_SurfaceControl.cpp
@@ -1164,6 +1164,25 @@
}
}
+static jboolean nativeGetDisplayBrightnessSupport(JNIEnv* env, jclass clazz,
+ jobject displayTokenObject) {
+ sp<IBinder> displayToken(ibinderForJavaObject(env, displayTokenObject));
+ if (displayToken == nullptr) {
+ return JNI_FALSE;
+ }
+ return static_cast<jboolean>(SurfaceComposerClient::getDisplayBrightnessSupport(displayToken));
+}
+
+static jboolean nativeSetDisplayBrightness(JNIEnv* env, jclass clazz, jobject displayTokenObject,
+ jfloat brightness) {
+ sp<IBinder> displayToken(ibinderForJavaObject(env, displayTokenObject));
+ if (displayToken == nullptr) {
+ return JNI_FALSE;
+ }
+ status_t error = SurfaceComposerClient::setDisplayBrightness(displayToken, brightness);
+ return error == OK ? JNI_TRUE : JNI_FALSE;
+}
+
// ----------------------------------------------------------------------------
static const JNINativeMethod sSurfaceControlMethods[] = {
@@ -1308,7 +1327,11 @@
{"nativeSetGeometry", "(JJLandroid/graphics/Rect;Landroid/graphics/Rect;J)V",
(void*)nativeSetGeometry },
{"nativeSyncInputWindows", "(J)V",
- (void*)nativeSyncInputWindows }
+ (void*)nativeSyncInputWindows },
+ {"nativeGetDisplayBrightnessSupport", "(Landroid/os/IBinder;)Z",
+ (void*)nativeGetDisplayBrightnessSupport },
+ {"nativeSetDisplayBrightness", "(Landroid/os/IBinder;F)Z",
+ (void*)nativeSetDisplayBrightness },
};
int register_android_view_SurfaceControl(JNIEnv* env)