Merge TP1A.220321.002

Change-Id: Ie8206e8b9c11c3fd55b7adddac5c782ad92c9da4

1 files changed, 3 insertions, 4 deletions

diff --git a/framework/java/android/bluetooth/BluetoothHeadset.java b/framework/java/android/bluetooth/BluetoothHeadset.java
index 3c1208551c..9cbfe2971a 100644
--- a/framework/java/android/bluetooth/BluetoothHeadset.java
+++ b/framework/java/android/bluetooth/BluetoothHeadset.java
@@ -51,6 +51,7 @@ import java.lang.annotation.RetentionPolicy;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.locks.ReentrantReadWriteLock;
+import java.util.Objects;
 import java.util.concurrent.TimeoutException;
 
 /**
@@ -962,7 +963,7 @@ public final class BluetoothHeadset implements BluetoothProfile {
      *
      * @param device is the Bluetooth device for which the audio state is being queried
      * @return the audio state of the device or an error code
-     * @throws IllegalArgumentException if the device is null
+     * @throws NullPointerException if the device is null
      *
      * @hide
      */
@@ -974,9 +975,7 @@ public final class BluetoothHeadset implements BluetoothProfile {
     })
     public @GetAudioStateReturnValues int getAudioState(@NonNull BluetoothDevice device) {
         if (VDBG) log("getAudioState");
-        if (device == null) {
-            throw new IllegalArgumentException("device cannot be null");
-        }
+        Objects.requireNonNull(device);
         final IBluetoothHeadset service = mService;
         final int defaultValue = BluetoothHeadset.STATE_AUDIO_DISCONNECTED;
         if (service == null) {