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

Commit 0ff4489c authored by Kenny Guy's avatar Kenny Guy
Browse files

Tag brightness APIs with @SystemAPI 

Make the API for tracking brightness
slider events and setting brightness
curves @SystemAPI and @TestAPI
Add developement scope to the brightness
slider events permission to allow cts
testing.

Bug: 69405990
Test: atest android.permission2.cts.PermissionPolicyTest#testPlatformPermissionPolicyUnaltered
Test: atest BrightnessTrackerTest
Change-Id: I39b0b26454528425b62cf99dc8bbccded4e14a18
parent d93d206c

api/system-current.txt

+32 −0
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ package android { 
    field public static final java.lang.String BIND_TV_REMOTE_SERVICE = "android.permission.BIND_TV_REMOTE_SERVICE";

    field public static final java.lang.String BLUETOOTH_PRIVILEGED = "android.permission.BLUETOOTH_PRIVILEGED";

    field public static final java.lang.String BRICK = "android.permission.BRICK";

    field public static final java.lang.String BRIGHTNESS_SLIDER_USAGE = "android.permission.BRIGHTNESS_SLIDER_USAGE";

    field public static final deprecated java.lang.String BROADCAST_NETWORK_PRIVILEGED = "android.permission.BROADCAST_NETWORK_PRIVILEGED";

    field public static final java.lang.String CALL_PRIVILEGED = "android.permission.CALL_PRIVILEGED";

    field public static final java.lang.String CAMERA_DISABLE_TRANSMIT_LED = "android.permission.CAMERA_DISABLE_TRANSMIT_LED";
@@ -46,6 +47,7 @@ package android { 
    field public static final java.lang.String CHANGE_CONFIGURATION = "android.permission.CHANGE_CONFIGURATION";

    field public static final java.lang.String CHANGE_DEVICE_IDLE_TEMP_WHITELIST = "android.permission.CHANGE_DEVICE_IDLE_TEMP_WHITELIST";

    field public static final java.lang.String CLEAR_APP_USER_DATA = "android.permission.CLEAR_APP_USER_DATA";

    field public static final java.lang.String CONFIGURE_DISPLAY_BRIGHTNESS = "android.permission.CONFIGURE_DISPLAY_BRIGHTNESS";

    field public static final java.lang.String CONNECTIVITY_INTERNAL = "android.permission.CONNECTIVITY_INTERNAL";

    field public static final java.lang.String CONNECTIVITY_USE_RESTRICTED_NETWORKS = "android.permission.CONNECTIVITY_USE_RESTRICTED_NETWORKS";

    field public static final java.lang.String CONTROL_INCALL_EXPERIENCE = "android.permission.CONTROL_INCALL_EXPERIENCE";
@@ -1078,8 +1080,38 @@ package android.hardware.camera2.params { 


package android.hardware.display {



  public final class BrightnessChangeEvent implements android.os.Parcelable {

    method public int describeContents();

    method public void writeToParcel(android.os.Parcel, int);

    field public static final android.os.Parcelable.Creator<android.hardware.display.BrightnessChangeEvent> CREATOR;

    field public final float batteryLevel;

    field public final float brightness;

    field public final int colorTemperature;

    field public final float lastBrightness;

    field public final long[] luxTimestamps;

    field public final float[] luxValues;

    field public final boolean nightMode;

    field public final java.lang.String packageName;

    field public final long timeStamp;

  }



  public final class BrightnessConfiguration implements android.os.Parcelable {

    method public int describeContents();

    method public android.util.Pair<float[], float[]> getCurve();

    method public void writeToParcel(android.os.Parcel, int);

    field public static final android.os.Parcelable.Creator<android.hardware.display.BrightnessConfiguration> CREATOR;

  }



  public static class BrightnessConfiguration.Builder {

    ctor public BrightnessConfiguration.Builder();

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

    method public android.hardware.display.BrightnessConfiguration.Builder setCurve(float[], float[]);

  }



  public final class DisplayManager {

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

    method public android.graphics.Point getStableDisplaySize();

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

  }



}

api/test-current.txt

+37 −0
Original line number Diff line number Diff line
@@ -293,6 +293,43 @@ package android.hardware.camera2 { 


}



package android.hardware.display {



  public final class BrightnessChangeEvent implements android.os.Parcelable {

    method public int describeContents();

    method public void writeToParcel(android.os.Parcel, int);

    field public static final android.os.Parcelable.Creator<android.hardware.display.BrightnessChangeEvent> CREATOR;

    field public final float batteryLevel;

    field public final float brightness;

    field public final int colorTemperature;

    field public final float lastBrightness;

    field public final long[] luxTimestamps;

    field public final float[] luxValues;

    field public final boolean nightMode;

    field public final java.lang.String packageName;

    field public final long timeStamp;

  }



  public final class BrightnessConfiguration implements android.os.Parcelable {

    method public int describeContents();

    method public android.util.Pair<float[], float[]> getCurve();

    method public void writeToParcel(android.os.Parcel, int);

    field public static final android.os.Parcelable.Creator<android.hardware.display.BrightnessConfiguration> CREATOR;

  }



  public static class BrightnessConfiguration.Builder {

    ctor public BrightnessConfiguration.Builder();

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

    method public android.hardware.display.BrightnessConfiguration.Builder setCurve(float[], float[]);

  }



  public final class DisplayManager {

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

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

  }



}



package android.location {



  public final class GnssClock implements android.os.Parcelable {

core/java/android/hardware/display/BrightnessChangeEvent.java

+112 −15
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ 


package android.hardware.display;



import android.annotation.SystemApi;

import android.annotation.TestApi;

import android.os.Parcel;

import android.os.Parcelable;
@@ -23,51 +25,65 @@ import android.os.Parcelable; 
 * Data about a brightness settings change.

 *

 * {@see DisplayManager.getBrightnessEvents()}

 * TODO make this SystemAPI

 * @hide

 */

@SystemApi

@TestApi

public final class BrightnessChangeEvent implements Parcelable {

    /** Brightness in nits */

    public float brightness;

    public final float brightness;



    /** Timestamp of the change {@see System.currentTimeMillis()} */

    public long timeStamp;

    public final long timeStamp;



    /** Package name of focused activity when brightness was changed.

     *  This will be null if the caller of {@see DisplayManager.getBrightnessEvents()}

     *  does not have access to usage stats {@see UsageStatsManager} */

    public String packageName;

    public final String packageName;



    /** User id of of the user running when brightness was changed.

     * @hide */

    public int userId;

    public final int userId;



    /** Lux values of recent sensor data */

    public float[] luxValues;

    public final float[] luxValues;



    /** Timestamps of the lux sensor readings {@see System.currentTimeMillis()} */

    public long[] luxTimestamps;

    public final long[] luxTimestamps;



    /** Most recent battery level when brightness was changed or Float.NaN */

    public float batteryLevel;

    public final float batteryLevel;



    /** Color filter active to provide night mode */

    public boolean nightMode;

    public final boolean nightMode;



    /** If night mode color filter is active this will be the temperature in kelvin */

    public int colorTemperature;

    public final int colorTemperature;



    /** Brightness le vel before slider adjustment */

    public float lastBrightness;

    public final float lastBrightness;



    public BrightnessChangeEvent() {

    /** @hide */

    private BrightnessChangeEvent(float brightness, long timeStamp, String packageName,

            int userId, float[] luxValues, long[] luxTimestamps, float batteryLevel,

            boolean nightMode, int colorTemperature, float lastBrightness) {

        this.brightness = brightness;

        this.timeStamp = timeStamp;

        this.packageName = packageName;

        this.userId = userId;

        this.luxValues = luxValues;

        this.luxTimestamps = luxTimestamps;

        this.batteryLevel = batteryLevel;

        this.nightMode = nightMode;

        this.colorTemperature = colorTemperature;

        this.lastBrightness = lastBrightness;

    }



    /** @hide */

    public BrightnessChangeEvent(BrightnessChangeEvent other) {

    public BrightnessChangeEvent(BrightnessChangeEvent other, boolean redactPackage) {

        this.brightness = other.brightness;

        this.timeStamp = other.timeStamp;

        this.packageName = other.packageName;

        this.packageName = redactPackage ? null : other.packageName;

        this.userId = other.userId;

        this.luxValues = other.luxValues;

        this.luxTimestamps = other.luxTimestamps;
@@ -118,4 +134,85 @@ public final class BrightnessChangeEvent implements Parcelable { 
        dest.writeInt(colorTemperature);

        dest.writeFloat(lastBrightness);

    }



    /** @hide */

    public static class Builder {

        private float mBrightness;

        private long mTimeStamp;

        private String mPackageName;

        private int mUserId;

        private float[] mLuxValues;

        private long[] mLuxTimestamps;

        private float mBatteryLevel;

        private boolean mNightMode;

        private int mColorTemperature;

        private float mLastBrightness;



        /** {@see BrightnessChangeEvent#brightness} */

        public Builder setBrightness(float brightness) {

            mBrightness = brightness;

            return this;

        }



        /** {@see BrightnessChangeEvent#timeStamp} */

        public Builder setTimeStamp(long timeStamp) {

            mTimeStamp = timeStamp;

            return this;

        }



        /** {@see BrightnessChangeEvent#packageName} */

        public Builder setPackageName(String packageName) {

            mPackageName = packageName;

            return this;

        }



        /** {@see BrightnessChangeEvent#userId} */

        public Builder setUserId(int userId) {

            mUserId = userId;

            return this;

        }



        /** {@see BrightnessChangeEvent#luxValues} */

        public Builder setLuxValues(float[] luxValues) {

            mLuxValues = luxValues;

            return this;

        }



        /** {@see BrightnessChangeEvent#luxTimestamps} */

        public Builder setLuxTimestamps(long[] luxTimestamps) {

            mLuxTimestamps = luxTimestamps;

            return this;

        }



        /** {@see BrightnessChangeEvent#batteryLevel} */

        public Builder setBatteryLevel(float batteryLevel) {

            mBatteryLevel = batteryLevel;

            return this;

        }



        /** {@see BrightnessChangeEvent#nightMode} */

        public Builder setNightMode(boolean nightMode) {

            mNightMode = nightMode;

            return this;

        }



        /** {@see BrightnessChangeEvent#colorTemperature} */

        public Builder setColorTemperature(int colorTemperature) {

            mColorTemperature = colorTemperature;

            return this;

        }



        /** {@see BrightnessChangeEvent#lastBrightness} */

        public Builder setLastBrightness(float lastBrightness) {

            mLastBrightness = lastBrightness;

            return this;

        }



        /** Builds a BrightnessChangeEvent */

        public BrightnessChangeEvent build() {

            return new BrightnessChangeEvent(mBrightness, mTimeStamp,

                    mPackageName, mUserId, mLuxValues, mLuxTimestamps, mBatteryLevel,

                    mNightMode, mColorTemperature, mLastBrightness);

        }

    }

}

core/java/android/hardware/display/BrightnessConfiguration.java

+4 −0
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ 


package android.hardware.display;



import android.annotation.SystemApi;

import android.annotation.TestApi;

import android.os.Parcel;

import android.os.Parcelable;

import android.util.Pair;
@@ -25,6 +27,8 @@ import com.android.internal.util.Preconditions; 
import java.util.Arrays;



/** @hide */

@SystemApi

@TestApi

public final class BrightnessConfiguration implements Parcelable {

    private final float[] mLux;

    private final float[] mNits;

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

+6 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ import android.annotation.Nullable; 
import android.annotation.RequiresPermission;

import android.annotation.SystemApi;

import android.annotation.SystemService;

import android.annotation.TestApi;

import android.app.KeyguardManager;

import android.content.Context;

import android.graphics.Point;
@@ -622,6 +623,8 @@ public final class DisplayManager { 
     * Fetch {@link BrightnessChangeEvent}s.

     * @hide until we make it a system api.

     */

    @SystemApi

    @TestApi

    @RequiresPermission(Manifest.permission.BRIGHTNESS_SLIDER_USAGE)

    public List<BrightnessChangeEvent> getBrightnessEvents() {

        return mGlobal.getBrightnessEvents(mContext.getOpPackageName());
@@ -632,6 +635,9 @@ public final class DisplayManager { 
     *

     * @hide

     */

    @SystemApi

    @TestApi

    @RequiresPermission(Manifest.permission.CONFIGURE_DISPLAY_BRIGHTNESS)

    public void setBrightnessConfiguration(BrightnessConfiguration c) {

        setBrightnessConfigurationForUser(c, UserHandle.myUserId());

    }