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

Commit a8b13fdf authored by Michael Wright's avatar Michael Wright Committed by Android (Google) Code Review
Browse files

Merge "Moved brightness from Lights to SF."

parents cbee8d1b 832b497a

core/java/android/view/SurfaceControl.java

+45 −0
Original line number Diff line number Diff line
@@ -63,6 +63,7 @@ import libcore.util.NativeAllocationRegistry; 
import java.io.Closeable;

import java.nio.ByteBuffer;

import java.nio.ByteOrder;

import java.util.Objects;



/**

 * Handle to an on-screen Surface managed by the system compositor. The SurfaceControl is
@@ -196,6 +197,9 @@ public final class SurfaceControl implements Parcelable { 
    private static native boolean nativeGetProtectedContentSupport();

    private static native void nativeSetMetadata(long transactionObj, int key, Parcel data);

    private static native void nativeSyncInputWindows(long transactionObj);

    private static native boolean nativeGetDisplayBrightnessSupport(IBinder displayToken);

    private static native boolean nativeSetDisplayBrightness(IBinder displayToken,

            float brightness);



    private final CloseGuard mCloseGuard = CloseGuard.get();

    private String mName;
@@ -1960,6 +1964,47 @@ public final class SurfaceControl implements Parcelable { 
        return nativeGetProtectedContentSupport();

    }



    /**

     * Returns whether brightness operations are supported on a display.

     *

     * @param displayToken

     *      The token for the display.

     *

     * @return Whether brightness operations are supported on the display.

     *

     * @hide

     */

    public static boolean getDisplayBrightnessSupport(IBinder displayToken) {

        return nativeGetDisplayBrightnessSupport(displayToken);

    }



    /**

     * Sets the brightness of a display.

     *

     * @param displayToken

     *      The token for the display whose brightness is set.

     * @param brightness

     *      A number between 0.0f (minimum brightness) and 1.0f (maximum brightness), or -1.0f to

     *      turn the backlight off.

     *

     * @return Whether the method succeeded or not.

     *

     * @throws IllegalArgumentException if:

     *      - displayToken is null;

     *      - brightness is NaN or greater than 1.0f.

     *

     * @hide

     */

    public static boolean setDisplayBrightness(IBinder displayToken, float brightness) {

        Objects.requireNonNull(displayToken);

        if (Float.isNaN(brightness) || brightness > 1.0f

                || (brightness < 0.0f && brightness != -1.0f)) {

            throw new IllegalArgumentException("brightness must be a number between 0.0f and 1.0f,"

                    + " or -1 to turn the backlight off.");

        }

        return nativeSetDisplayBrightness(displayToken, brightness);

    }



    /**

     * An atomic set of changes to a set of SurfaceControl.

     */

core/jni/android_view_SurfaceControl.cpp

+24 −1
Original line number Diff line number Diff line
@@ -1164,6 +1164,25 @@ static void nativeWriteToParcel(JNIEnv* env, jclass clazz, 
    }

}



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 @@ static const JNINativeMethod sSurfaceControlMethods[] = { 
    {"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)

services/core/java/com/android/server/lights/Light.java

+9 −1
Original line number Diff line number Diff line
@@ -16,8 +16,8 @@ 


package com.android.server.lights;



import android.hardware.light.V2_0.Flash;

import android.hardware.light.V2_0.Brightness;

import android.hardware.light.V2_0.Flash;



public abstract class Light {

    public static final int LIGHT_FLASH_NONE = Flash.NONE;
@@ -39,8 +39,16 @@ public abstract class Light { 
     */

    public static final int BRIGHTNESS_MODE_LOW_PERSISTENCE = Brightness.LOW_PERSISTENCE;



    /**

     * Set the brightness of a display.

     */

    public abstract void setBrightness(int brightness);



    /**

     * Set the brightness and mode of a display.

     */

    public abstract void setBrightness(int brightness, int brightnessMode);



    public abstract void setColor(int color);

    public abstract void setFlashing(int color, int mode, int onMS, int offMS);

    public abstract void pulse();

services/core/java/com/android/server/lights/LightsService.java

+44 −8
Original line number Diff line number Diff line
@@ -15,15 +15,18 @@ 


package com.android.server.lights;



import com.android.server.SystemService;



import android.app.ActivityManager;

import android.content.Context;

import android.os.Handler;

import android.os.IBinder;

import android.os.Message;

import android.os.PowerManager;

import android.os.Trace;

import android.provider.Settings;

import android.util.Slog;

import android.view.SurfaceControl;



import com.android.server.SystemService;



public class LightsService extends SystemService {

    static final String TAG = "LightsService";
@@ -33,8 +36,25 @@ public class LightsService extends SystemService { 


    private final class LightImpl extends Light {



        private LightImpl(int id) {

        private final IBinder mDisplayToken;

        private final int mSurfaceControlMaximumBrightness;



        private LightImpl(Context context, int id) {

            mId = id;

            mDisplayToken = SurfaceControl.getInternalDisplayToken();

            final boolean brightnessSupport = SurfaceControl.getDisplayBrightnessSupport(

                    mDisplayToken);

            if (DEBUG) {

                Slog.d(TAG, "Display brightness support: " + brightnessSupport);

            }

            int maximumBrightness = 0;

            if (brightnessSupport) {

                PowerManager pm = context.getSystemService(PowerManager.class);

                if (pm != null) {

                    maximumBrightness = pm.getMaximumScreenBrightnessSetting();

                }

            }

            mSurfaceControlMaximumBrightness = maximumBrightness;

        }



        @Override
@@ -51,12 +71,28 @@ public class LightsService extends SystemService { 
                            ": brightness=0x" + Integer.toHexString(brightness));

                    return;

                }



                // Ideally, we'd like to set the brightness mode through the SF/HWC as well, but

                // right now we just fall back to the old path through Lights brightessMode is

                // anything but USER or the device shouldBeInLowPersistenceMode().

                if (brightnessMode == BRIGHTNESS_MODE_USER && !shouldBeInLowPersistenceMode()

                        && mSurfaceControlMaximumBrightness == 255) {

                    // TODO: the last check should be mSurfaceControlMaximumBrightness != 0; the

                    // reason we enforce 255 right now is to stay consistent with the old path. In

                    // the future, the framework should be refactored so that brightness is a float

                    // between 0.0f and 1.0f, and the actual number of supported brightness levels

                    // is determined in the device-specific implementation.

                    if (DEBUG) {

                        Slog.d(TAG, "Using new setBrightness path!");

                    }

                    SurfaceControl.setDisplayBrightness(mDisplayToken,

                            (float) brightness / mSurfaceControlMaximumBrightness);

                } else {

                    int color = brightness & 0x000000ff;

                    color = 0xff000000 | (color << 16) | (color << 8) | color;

                    setLightLocked(color, LIGHT_FLASH_NONE, 0, 0, brightnessMode);

                }

            }

        }



        @Override

        public void setColor(int color) {
@@ -172,7 +208,7 @@ public class LightsService extends SystemService { 
        super(context);



        for (int i = 0; i < LightsManager.LIGHT_ID_COUNT; i++) {

            mLights[i] = new LightImpl(i);

            mLights[i] = new LightImpl(context, i);

        }

    }