commit c634eb57260d93ccb0383159e08de9e0d9bf5db8
author Yuyang Huang <yuyanghuang@google.com> Tue Apr 02 05:45:07 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Apr 02 05:45:07 2024 +0000
tree 45c9f0016cb899373064d3f9654b6346169dd3c6
parent 5250ebe96e19282a255f626cfb8efa18603c9924
parent 52776a3c8c83eb0e9860085fba57ca8a918ea272

Merge "Tethering: Throw exception when register null callback to avoid a crash" into main

Tethering/src/com/android/networkstack/tethering/Tethering.java

diff --git a/Tethering/src/com/android/networkstack/tethering/Tethering.java b/Tethering/src/com/android/networkstack/tethering/Tethering.java
index 0105607..d85d92f 100644
--- a/Tethering/src/com/android/networkstack/tethering/Tethering.java
+++ b/Tethering/src/com/android/networkstack/tethering/Tethering.java
@@ -2384,6 +2384,9 @@
                 hasCallingPermission(NETWORK_SETTINGS)
                         || hasCallingPermission(PERMISSION_MAINLINE_NETWORK_STACK)
                         || hasCallingPermission(NETWORK_STACK);
+        if (callback == null) {
+            throw new NullPointerException();
+        }
         mHandler.post(() -> {
             mTetheringEventCallbacks.register(callback, new CallbackCookie(hasListPermission));
             final TetheringCallbackStartedParcel parcel = new TetheringCallbackStartedParcel();