Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Tag @SystemApi to ambient brightness stats API" into pi-dev

Browse Source 
am: 9a2857d927

Change-Id: Id5d1003e81427ccf6a4d93928a250ce67dc454ac
This commit is contained in:
Peeyush Agarwal
2018-03-08 16:10:51 +00:00
committed by android-build-merger
parent a95ae52341 9a2857d927
commit 16f0af89b4
4 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/system-current.txt
View File

@@ -1,6 +1,7 @@
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);

1
api/test-current.txt
View File

@@ -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);

3
core/java/android/hardware/display/DisplayManager.java
View File

@@ -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();

4
core/res/AndroidManifest.xml
View File

@@ -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" />