commit 3dcd3f6c8d25a57920d8ec73a7e1e0e7ebb9e21d
author Wei Wang <wvw@google.com> Wed Feb 13 15:46:31 2019 -0800
committer Wei Wang <wvw@google.com> Wed Feb 13 18:19:52 2019 -0800
tree 6300afd9238a8c3a8a7cd01e0f304a1d72320ad2
parent ad41c7bb2aa56b4103deba553931c143ecd68bfe

Add NonNull annotation into unregisterThermalStatusCallback

Bug: 119613338
Test: Build
Change-Id: I4fde9ba69b549fa61197c53d99a0c394dd3dcc82

api/current.txt

diff --git a/api/current.txt b/api/current.txt
index 7ead41c..a9ff6c6 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -35035,7 +35035,7 @@
     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

diff --git a/core/java/android/os/PowerManager.java b/core/java/android/os/PowerManager.java
index 2ecf9d1..cfe2d28 100644
--- a/core/java/android/os/PowerManager.java
+++ b/core/java/android/os/PowerManager.java
@@ -1784,7 +1784,7 @@
      *
      * 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) {