| commit | 9403e13e981bac5b0f445dbc6a9cc568e5708730 | [log] [tgz] |
|---|---|---|
| author | Steven Moreland <smoreland@google.com> | Sat Jan 07 03:07:14 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat Jan 07 03:07:14 2023 +0000 |
| tree | 2396fefa458bfd66e0a494793d1974a283c45b0e | |
| parent | 20a030545cb3b2e9879f22e4d84fcbbdac28d98f [diff] | |
| parent | 645d524fba8498e89b0a1b3b8fa92685acc2fee7 [diff] |
Merge "unregistered null callback will cause a crash later" am: f4e0f096b5 am: 645d524fba Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2372391 Change-Id: I44beeb193041c47c3b98c3c1a10ecb195511dd97 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/Tethering/src/com/android/networkstack/tethering/Tethering.java b/Tethering/src/com/android/networkstack/tethering/Tethering.java index b3ec805..e1b7016 100644 --- a/Tethering/src/com/android/networkstack/tethering/Tethering.java +++ b/Tethering/src/com/android/networkstack/tethering/Tethering.java
@@ -2407,6 +2407,9 @@ /** Unregister tethering event callback */ void unregisterTetheringEventCallback(ITetheringEventCallback callback) { + if (callback == null) { + throw new NullPointerException(); + } mHandler.post(() -> { mTetheringEventCallbacks.unregister(callback); });