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

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

Merge "Revert "Fixed power manager CTS test."" into pi-dev am: ca1dcfb2 

am: ad93f44a

Change-Id: I84dc34980d768ee8807c4d9b045a1971dfdbff03
parents f1c82fa6 ad93f44a

api/test-current.txt

+0 −4
Original line number Original line Diff line number Diff line
@@ -604,10 +604,6 @@ 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;

  }

  }

core/java/android/os/PowerManager.java

+0 −2
Original line number Original line Diff line number Diff line
@@ -21,7 +21,6 @@ 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;
@@ -961,7 +960,6 @@ 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);