From 083a03b0423f2c04a434667b5b3e380b95ae3766 Mon Sep 17 00:00:00 2001
From: Matthew Sedam <matthewsedam@google.com>
Date: Thu, 5 Jan 2023 19:42:15 +0000
Subject: [PATCH] Add @Nullable to SensorManager.getDefaultSensor's return
 value

The return value can be null, so add the @Nullable annotation.

Bug: 264386251
Test: make, flash, verify boot
Test: presubmits
Change-Id: I04f65fe6e57f89c89186278950f5ee19b020a7ad
---
 core/api/current.txt                          | 4 ++--
 core/java/android/hardware/SensorManager.java | 5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/core/api/current.txt b/core/api/current.txt
index ff9c7b130e959..d1327067c0b89 100644
--- a/core/api/current.txt
+++ b/core/api/current.txt
@@ -17088,8 +17088,8 @@ package android.hardware {
     method public boolean flush(android.hardware.SensorEventListener);
     method public static float getAltitude(float, float);
     method public static void getAngleChange(float[], float[], float[]);
-    method public android.hardware.Sensor getDefaultSensor(int);
-    method public android.hardware.Sensor getDefaultSensor(int, boolean);
+    method @Nullable public android.hardware.Sensor getDefaultSensor(int);
+    method @Nullable public android.hardware.Sensor getDefaultSensor(int, boolean);
     method public java.util.List<android.hardware.Sensor> getDynamicSensorList(int);
     method public static float getInclination(float[]);
     method public static float[] getOrientation(float[], float[]);
diff --git a/core/java/android/hardware/SensorManager.java b/core/java/android/hardware/SensorManager.java
index dec424c3ad7a6..6d8c4a93b44eb 100644
--- a/core/java/android/hardware/SensorManager.java
+++ b/core/java/android/hardware/SensorManager.java
@@ -16,6 +16,7 @@
 
 package android.hardware;
 
+import android.annotation.Nullable;
 import android.annotation.SystemApi;
 import android.annotation.SystemService;
 import android.compat.annotation.UnsupportedAppUsage;
@@ -496,7 +497,7 @@ public abstract class SensorManager {
      * @see #getSensorList(int)
      * @see Sensor
      */
-    public Sensor getDefaultSensor(int type) {
+    public @Nullable Sensor getDefaultSensor(int type) {
         // TODO: need to be smarter, for now, just return the 1st sensor
         List<Sensor> l = getSensorList(type);
         boolean wakeUpSensor = false;
@@ -544,7 +545,7 @@ public abstract class SensorManager {
      *         and the application has the necessary permissions, or null otherwise.
      * @see Sensor#isWakeUpSensor()
      */
-    public Sensor getDefaultSensor(int type, boolean wakeUp) {
+    public @Nullable Sensor getDefaultSensor(int type, boolean wakeUp) {
         List<Sensor> l = getSensorList(type);
         for (Sensor sensor : l) {
             if (sensor.isWakeUpSensor() == wakeUp) {