Merge "Always return nonNull in BluetoothAdapter.getUuids"

1 files changed, 3 insertions, 3 deletions

diff --git a/framework/java/android/bluetooth/BluetoothAdapter.java b/framework/java/android/bluetooth/BluetoothAdapter.java
index c8a1f5a1c8..46d19217dd 100644
--- a/framework/java/android/bluetooth/BluetoothAdapter.java
+++ b/framework/java/android/bluetooth/BluetoothAdapter.java
@@ -1438,9 +1438,9 @@ public final class BluetoothAdapter {
     @RequiresBluetoothConnectPermission
     @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)
     @SuppressLint(value = {"ArrayReturn", "NullableCollection"})
-    public @Nullable ParcelUuid[] getUuids() {
+    public @NonNull ParcelUuid[] getUuids() {
         if (getState() != STATE_ON) {
-            return null;
+            return new ParcelUuid[0];
         }
         try {
             mServiceLock.readLock().lock();
@@ -1457,7 +1457,7 @@ public final class BluetoothAdapter {
         } finally {
             mServiceLock.readLock().unlock();
         }
-        return null;
+        return new ParcelUuid[0];
     }
 
     /**