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

Commit ccf1186b authored by Michael Wright's avatar Michael Wright Committed by android-build-merger
Browse files

Merge "Expose the new brightness permissions as test APIs." into pi-dev am: 3ed6c633 

am: 6991d9df

Change-Id: I85b309cb36855aabe5a1dcae3d06d660b8859d8e
parents 1e2e4951 6991d9df

api/test-current.txt

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



  public static final class Manifest.permission {

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

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

  }



}



package android.animation {

package android.animation {





  public class ValueAnimator extends android.animation.Animator {

  public class ValueAnimator extends android.animation.Animator {

core/res/AndroidManifest.xml

+4 −2
Original line number Original line Diff line number Diff line
@@ -3089,7 +3089,8 @@ 
    <!-- Allows an application to collect usage infomation about brightness slider changes.

    <!-- Allows an application to collect usage infomation about brightness slider changes.

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

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

         @hide

         @hide

         @SystemApi -->

         @SystemApi

         @TestApi -->

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

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

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

        android:protectionLevel="signature|privileged|development" />
@@ -3102,7 +3103,8 @@ 




    <!-- Allows an application to modify the display brightness configuration

    <!-- Allows an application to modify the display brightness configuration

         @hide

         @hide

         @SystemApi -->

         @SystemApi

         @TestApi -->

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

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

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

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