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

Commit 17ad53b4 authored by Dan Gittik's avatar Dan Gittik Committed by android-build-merger
Browse files

Merge "Fixed power manager CTS test." into pi-dev 

am: 15d35c12

Change-Id: I375d0d77520a707cc76064a93def15faa5f8ddb1
parents 1345d5e1 15d35c12

api/test-current.txt

+4 −0
Original line number Original line Diff line number Diff line
@@ -604,6 +604,10 @@ package android.os { 
    field public static final android.os.Parcelable.Creator<android.os.IncidentReportArgs> CREATOR;

    field public static final android.os.Parcelable.Creator<android.os.IncidentReportArgs> CREATOR;

  }

  }





  public final class PowerManager {

    method public void nap(long);

  }



  public class Process {

  public class Process {

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

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

  }

  }

config/hiddenapi-light-greylist.txt

+0 −1
Original line number Original line Diff line number Diff line
@@ -1500,7 +1500,6 @@ Landroid/os/PowerManager;->getMaximumScreenBrightnessSetting()I 
Landroid/os/PowerManager;->getMinimumScreenBrightnessSetting()I

Landroid/os/PowerManager;->getMinimumScreenBrightnessSetting()I

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

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

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

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

Landroid/os/PowerManager;->nap(J)V

Landroid/os/PowerManager;->userActivity(JZ)V

Landroid/os/PowerManager;->userActivity(JZ)V

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

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

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

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

core/java/android/os/PowerManager.java

+2 −0
Original line number Original line Diff line number Diff line
@@ -21,6 +21,7 @@ import android.annotation.RequiresPermission; 
import android.annotation.SdkConstant;

import android.annotation.SdkConstant;

import android.annotation.SystemApi;

import android.annotation.SystemApi;

import android.annotation.SystemService;

import android.annotation.SystemService;

import android.annotation.TestApi;

import android.content.Context;

import android.content.Context;

import android.util.Log;

import android.util.Log;

import android.util.proto.ProtoOutputStream;

import android.util.proto.ProtoOutputStream;
@@ -960,6 +961,7 @@ public final class PowerManager { 
     *

     *

     * @hide Requires signature permission.

     * @hide Requires signature permission.

     */

     */

    @TestApi

    public void nap(long time) {

    public void nap(long time) {

        try {

        try {

            mService.nap(time);

            mService.nap(time);