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

Commit b5abef78 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: 62444d49 

am: 33ca88a1

Change-Id: I3ed21dbc86c56ab1a9182607bb7bba7bbc73229e
parents 4d2b2819 33ca88a1

api/test-current.txt

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

  }



  public final class PowerManager {

    method public void nap(long);

  }



  public class Process {

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

  }

core/java/android/os/PowerManager.java

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

import android.annotation.SystemApi;

import android.annotation.SystemService;

import android.annotation.TestApi;

import android.content.Context;

import android.util.Log;

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

     * @hide Requires signature permission.

     */

    @TestApi

    public void nap(long time) {

        try {

            mService.nap(time);