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

Commit bbd22043 authored by Salvador Martinez's avatar Salvador Martinez Committed by Android (Google) Code Review
Browse files

Merge "Add new POWER_SAVER permission & update api"

parents ba0340ff a80bbab5

api/system-current.txt

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

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

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

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

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

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

    field public static final java.lang.String QUERY_TIME_ZONE_RULES = "android.permission.QUERY_TIME_ZONE_RULES";
@@ -3995,6 +3996,7 @@ package android.os { 
  }



  public final class PowerManager {

    method public boolean setPowerSaveMode(boolean);

    method public void userActivity(long, int, int);

    field public static final int USER_ACTIVITY_EVENT_ACCESSIBILITY = 3; // 0x3

    field public static final int USER_ACTIVITY_EVENT_BUTTON = 1; // 0x1

api/test-current.txt

+4 −0
Original line number Diff line number Diff line
@@ -708,6 +708,10 @@ package android.os { 
    method public void removeSyncBarrier(int);

  }



  public final class PowerManager {

    method public boolean setPowerSaveMode(boolean);

  }



  public class Process {

    method public static final int getThreadScheduler(int) throws java.lang.IllegalArgumentException;

  }

config/hiddenapi-light-greylist.txt

+0 −1
Original line number Diff line number Diff line
@@ -867,7 +867,6 @@ Landroid/os/PowerManager;->GO_TO_SLEEP_REASON_TIMEOUT:I 
Landroid/os/PowerManager;->isLightDeviceIdleMode()Z

Landroid/os/PowerManager;->mHandler:Landroid/os/Handler;

Landroid/os/PowerManager;->mService:Landroid/os/IPowerManager;

Landroid/os/PowerManager;->setPowerSaveMode(Z)Z

Landroid/os/PowerManager;->validateWakeLockParameters(ILjava/lang/String;)V

Landroid/os/PowerManager;->wakeUp(JLjava/lang/String;)V

Landroid/os/Process;->BLUETOOTH_UID:I

core/java/android/os/PowerManager.java

+7 −2
Original line number Diff line number Diff line
@@ -1154,10 +1154,15 @@ public final class PowerManager { 
     *

     * @return True if the set was allowed.

     *

     * @see #isPowerSaveMode()

     *

     * @hide

     * @see #isPowerSaveMode()

     */

    @SystemApi

    @TestApi

    @RequiresPermission(anyOf = {

            android.Manifest.permission.DEVICE_POWER,

            android.Manifest.permission.POWER_SAVER

    })

    public boolean setPowerSaveMode(boolean mode) {

        try {

            return mService.setPowerSaveMode(mode);

core/res/AndroidManifest.xml

+6 −0
Original line number Diff line number Diff line
@@ -3406,6 +3406,12 @@ 
   <permission android:name="android.permission.DEVICE_POWER"

        android:protectionLevel="signature" />



    <!-- Allows toggling battery saver on the system.

         Superseded by DEVICE_POWER permission. @hide @SystemApi

    -->

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

        android:protectionLevel="signature|privileged" />



   <!-- Allows access to the PowerManager.userActivity function.

   <p>Not for use by third-party applications. @hide @SystemApi -->

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