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

Commit dbc97088 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Add NonNull annotation into unregisterThermalStatusCallback"

parents fee9bcf8 3dcd3f6c

api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -35052,7 +35052,7 @@ package android.os { 
    method public android.os.PowerManager.WakeLock newWakeLock(int, String);

    method public void reboot(String);

    method public void registerThermalStatusCallback(@NonNull android.os.PowerManager.ThermalStatusCallback, @NonNull java.util.concurrent.Executor);

    method public void unregisterThermalStatusCallback(android.os.PowerManager.ThermalStatusCallback);

    method public void unregisterThermalStatusCallback(@NonNull android.os.PowerManager.ThermalStatusCallback);

    field public static final int ACQUIRE_CAUSES_WAKEUP = 268435456; // 0x10000000

    field public static final String ACTION_DEVICE_IDLE_MODE_CHANGED = "android.os.action.DEVICE_IDLE_MODE_CHANGED";

    field public static final String ACTION_POWER_SAVE_MODE_CHANGED = "android.os.action.POWER_SAVE_MODE_CHANGED";

core/java/android/os/PowerManager.java

+1 −1
Original line number Diff line number Diff line
@@ -1784,7 +1784,7 @@ public final class PowerManager { 
     *

     * see {@link #registerThermalStatusCallback}

     */

    public void unregisterThermalStatusCallback(ThermalStatusCallback callback) {

    public void unregisterThermalStatusCallback(@NonNull ThermalStatusCallback callback) {

        Preconditions.checkNotNull(callback, "callback cannnot be null");

        synchronized (this) {

            if (mThermalService == null) {