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

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

Merge "Tag @SystemApi to ambient brightness stats API"

parents a597260b 1584fa6f

api/system-current.txt

+2 −0
Original line number Original line Diff line number Diff line 
package android {

package android {





  public static final class Manifest.permission {

  public static final class Manifest.permission {

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

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

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

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

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

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

    field public static final java.lang.String ACCESS_CHECKIN_PROPERTIES = "android.permission.ACCESS_CHECKIN_PROPERTIES";
@@ -1220,6 +1221,7 @@ package android.hardware.display { 
  }

  }





  public final class DisplayManager {

  public final class DisplayManager {

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

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

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

    method public android.graphics.Point getStableDisplaySize();

    method public android.graphics.Point getStableDisplaySize();

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

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

api/test-current.txt

+1 −0
Original line number Original line Diff line number Diff line
@@ -360,6 +360,7 @@ package android.hardware.display { 
  }

  }





  public final class DisplayManager {

  public final class DisplayManager {

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

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

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

    method public android.graphics.Point getStableDisplaySize();

    method public android.graphics.Point getStableDisplaySize();

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

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

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

+2 −1
Original line number Original line Diff line number Diff line
@@ -28,7 +28,6 @@ import android.content.Context; 
import android.graphics.Point;

import android.graphics.Point;

import android.media.projection.MediaProjection;

import android.media.projection.MediaProjection;

import android.os.Handler;

import android.os.Handler;

import android.os.UserHandle;

import android.util.SparseArray;

import android.util.SparseArray;

import android.view.Display;

import android.view.Display;

import android.view.Surface;

import android.view.Surface;
@@ -636,6 +635,8 @@ public final class DisplayManager { 
     *

     *

     * @hide until we make it a system api

     * @hide until we make it a system api

     */

     */

    @SystemApi

    @TestApi

    @RequiresPermission(Manifest.permission.ACCESS_AMBIENT_LIGHT_STATS)

    @RequiresPermission(Manifest.permission.ACCESS_AMBIENT_LIGHT_STATS)

    public List<AmbientBrightnessDayStats> getAmbientBrightnessStats() {

    public List<AmbientBrightnessDayStats> getAmbientBrightnessStats() {

        return mGlobal.getAmbientBrightnessStats();

        return mGlobal.getAmbientBrightnessStats();

core/res/AndroidManifest.xml

+2 −2
Original line number Original line Diff line number Diff line
@@ -3093,8 +3093,8 @@ 




    <!-- Allows an application to collect ambient light stats.

    <!-- Allows an application to collect ambient light stats.

         <p>Not for use by third party applications.</p>

         <p>Not for use by third party applications.</p>

         TODO: Make a system API

         @hide

         @hide -->

         @SystemApi -->

    <permission android:name="android.permission.ACCESS_AMBIENT_LIGHT_STATS"

    <permission android:name="android.permission.ACCESS_AMBIENT_LIGHT_STATS"

        android:protectionLevel="signature|privileged|development" />

        android:protectionLevel="signature|privileged|development" />