Never register a null lease callback.

Bug: 149458372
Test: new unit test
Test: tethering no longer crashes
Change-Id: Ic5f709c1ce50d3bb7af26a698dd32adb87012316

1 files changed, 3 insertions, 1 deletions

diff --git a/src/android/net/dhcp/DhcpServer.java b/src/android/net/dhcp/DhcpServer.java
index bcca47a..9e54a69 100644
--- a/src/android/net/dhcp/DhcpServer.java
+++ b/src/android/net/dhcp/DhcpServer.java
@@ -359,7 +359,9 @@ public class DhcpServer extends IDhcpServer.Stub {
                     final Pair<INetworkStackStatusCallback, IDhcpLeaseCallbacks> obj =
                             (Pair<INetworkStackStatusCallback, IDhcpLeaseCallbacks>) msg.obj;
                     cb = obj.first;
-                    mLeaseRepo.addLeaseCallbacks(obj.second);
+                    if (obj.second != null) {
+                        mLeaseRepo.addLeaseCallbacks(obj.second);
+                    }
                     mPacketListener = mDeps.makePacketListener();
                     mPacketListener.start();
                     break;