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

Commit daec95a7 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Get current and default brightness configs." into pi-dev

parents dbad69dd 6d1009f8

api/system-current.txt

+2 −0
Original line number Diff line number Diff line
@@ -1233,7 +1233,9 @@ package android.hardware.display { 


  public final class DisplayManager {

    method public java.util.List<android.hardware.display.AmbientBrightnessDayStats> getAmbientBrightnessStats();

    method public android.hardware.display.BrightnessConfiguration getBrightnessConfiguration();

    method public java.util.List<android.hardware.display.BrightnessChangeEvent> getBrightnessEvents();

    method public android.hardware.display.BrightnessConfiguration getDefaultBrightnessConfiguration();

    method public android.graphics.Point getStableDisplaySize();

    method public void setBrightnessConfiguration(android.hardware.display.BrightnessConfiguration);

  }

api/test-current.txt

+2 −0
Original line number Diff line number Diff line
@@ -370,7 +370,9 @@ package android.hardware.display { 


  public final class DisplayManager {

    method public java.util.List<android.hardware.display.AmbientBrightnessDayStats> getAmbientBrightnessStats();

    method public android.hardware.display.BrightnessConfiguration getBrightnessConfiguration();

    method public java.util.List<android.hardware.display.BrightnessChangeEvent> getBrightnessEvents();

    method public android.hardware.display.BrightnessConfiguration getDefaultBrightnessConfiguration();

    method public android.graphics.Point getStableDisplaySize();

    method public void setBrightnessConfiguration(android.hardware.display.BrightnessConfiguration);

  }

core/java/android/hardware/display/DisplayManager.java

+39 −0
Original line number Diff line number Diff line
@@ -667,6 +667,45 @@ public final class DisplayManager { 
        mGlobal.setBrightnessConfigurationForUser(c, userId, packageName);

    }



    /**

     * Gets the global display brightness configuration or the default curve if one hasn't been set.

     *

     * @hide

     */

    @SystemApi

    @TestApi

    @RequiresPermission(Manifest.permission.CONFIGURE_DISPLAY_BRIGHTNESS)

    public BrightnessConfiguration getBrightnessConfiguration() {

        return getBrightnessConfigurationForUser(mContext.getUserId());

    }



    /**

     * Gets the global display brightness configuration or the default curve if one hasn't been set

     * for a specific user.

     *

     * Note this requires the INTERACT_ACROSS_USERS permission if getting the configuration for a

     * user other than the one you're currently running as.

     *

     * @hide

     */

    public BrightnessConfiguration getBrightnessConfigurationForUser(int userId) {

        return mGlobal.getBrightnessConfigurationForUser(userId);

    }



    /**

     * Gets the default global display brightness configuration or null one hasn't

     * been configured.

     *

     * @hide

     */

    @SystemApi

    @TestApi

    @RequiresPermission(Manifest.permission.CONFIGURE_DISPLAY_BRIGHTNESS)

    @Nullable

    public BrightnessConfiguration getDefaultBrightnessConfiguration() {

        return mGlobal.getDefaultBrightnessConfiguration();

    }



    /**

     * Temporarily sets the brightness of the display.

     * <p>

core/java/android/hardware/display/DisplayManagerGlobal.java

+26 −0
Original line number Diff line number Diff line
@@ -489,6 +489,32 @@ public final class DisplayManagerGlobal { 
        }

    }



    /**

     * Gets the global brightness configuration for a given user or null if one hasn't been set.

     *

     * @hide

     */

    public BrightnessConfiguration getBrightnessConfigurationForUser(int userId) {

        try {

            return mDm.getBrightnessConfigurationForUser(userId);

        } catch (RemoteException ex) {

            throw ex.rethrowFromSystemServer();

        }

    }



    /**

     * Gets the default brightness configuration or null if one hasn't been configured.

     *

     * @hide

     */

    public BrightnessConfiguration getDefaultBrightnessConfiguration() {

        try {

            return mDm.getDefaultBrightnessConfiguration();

        } catch (RemoteException ex) {

            throw ex.rethrowFromSystemServer();

        }

    }



    /**

     * Temporarily sets the brightness of the display.

     * <p>

core/java/android/hardware/display/IDisplayManager.aidl

+8 −0
Original line number Diff line number Diff line
@@ -96,6 +96,14 @@ interface IDisplayManager { 
    void setBrightnessConfigurationForUser(in BrightnessConfiguration c, int userId,

            String packageName);



    // Gets the global brightness configuration for a given user. Requires

    // CONFIGURE_DISPLAY_BRIGHTNESS, and INTERACT_ACROSS_USER if the user is not

    // the same as the calling user.

    BrightnessConfiguration getBrightnessConfigurationForUser(int userId);



    // Gets the default brightness configuration if configured.

    BrightnessConfiguration getDefaultBrightnessConfiguration();



    // Temporarily sets the display brightness.

    void setTemporaryBrightness(int brightness);