commit c44e22445afd2fce97b9ba2d6d980d5a8f052fdb
author TreeHugger Robot <treehugger-gerrit@google.com> Fri Mar 31 10:40:10 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Mar 31 10:40:10 2023 +0000
tree 9eedaeee9fc2078447e3882d09c0c389b49b0455
parent a008c3aa54144dd68143a0c034cd3893bd3bee6b
parent 5a7700aaae5e20c32de683cbe39219cfc7957e9e

Merge "Remove a redundant @NonNull annotation of a void method."

core/api/system-current.txt

diff --git a/core/api/system-current.txt b/core/api/system-current.txt
index 593c5b0..92a5da7 100644
--- a/core/api/system-current.txt
+++ b/core/api/system-current.txt
@@ -3221,7 +3221,7 @@
     method @RequiresPermission(android.Manifest.permission.CREATE_VIRTUAL_DEVICE) public void registerIntentInterceptor(@NonNull android.content.IntentFilter, @NonNull java.util.concurrent.Executor, @NonNull android.companion.virtual.VirtualDeviceManager.IntentInterceptorCallback);
     method public void removeActivityListener(@NonNull android.companion.virtual.VirtualDeviceManager.ActivityListener);
     method public void removeSoundEffectListener(@NonNull android.companion.virtual.VirtualDeviceManager.SoundEffectListener);
-    method @NonNull @RequiresPermission(android.Manifest.permission.CREATE_VIRTUAL_DEVICE) public void setShowPointerIcon(boolean);
+    method @RequiresPermission(android.Manifest.permission.CREATE_VIRTUAL_DEVICE) public void setShowPointerIcon(boolean);
     method @RequiresPermission(android.Manifest.permission.CREATE_VIRTUAL_DEVICE) public void unregisterIntentInterceptor(@NonNull android.companion.virtual.VirtualDeviceManager.IntentInterceptorCallback);
   }
 

core/java/android/companion/virtual/VirtualDeviceManager.java

diff --git a/core/java/android/companion/virtual/VirtualDeviceManager.java b/core/java/android/companion/virtual/VirtualDeviceManager.java
index d3d635e..6b851a1 100644
--- a/core/java/android/companion/virtual/VirtualDeviceManager.java
+++ b/core/java/android/companion/virtual/VirtualDeviceManager.java
@@ -651,7 +651,6 @@
          *                        visibility is true.
          */
         @RequiresPermission(android.Manifest.permission.CREATE_VIRTUAL_DEVICE)
-        @NonNull
         public void setShowPointerIcon(boolean showPointerIcon) {
             mVirtualDeviceInternal.setShowPointerIcon(showPointerIcon);
         }