Merge "WifiServiceImpl: Ignore null binder objects"

2 files changed, 7 insertions, 19 deletions

diff --git a/service/java/com/android/server/wifi/ClientModeImpl.java b/service/java/com/android/server/wifi/ClientModeImpl.java
index 535d2f4b2..488f8feeb 100644
--- a/service/java/com/android/server/wifi/ClientModeImpl.java
+++ b/service/java/com/android/server/wifi/ClientModeImpl.java
@@ -6180,9 +6180,9 @@ public class ClientModeImpl extends StateMachine {
     /**
      * Trigger network connection and provide status via the provided callback.
      */
-    public void connect(WifiConfiguration config, int netId, IBinder binder,
+    public void connect(WifiConfiguration config, int netId, @Nullable IBinder binder,
             @Nullable IActionListener callback, int callbackIdentifier, int callingUid) {
-        if (callback != null) {
+        if (callback != null && binder != null) {
             synchronized (mProcessingActionListeners) {
                 mProcessingActionListeners.add(binder, callback, callbackIdentifier);
             }
@@ -6195,9 +6195,9 @@ public class ClientModeImpl extends StateMachine {
     /**
      * Trigger network save and provide status via the provided callback.
      */
-    public void save(WifiConfiguration config, IBinder binder, @Nullable IActionListener callback,
-            int callbackIdentifier, int callingUid) {
-        if (callback != null) {
+    public void save(WifiConfiguration config, @Nullable IBinder binder,
+            @Nullable IActionListener callback, int callbackIdentifier, int callingUid) {
+        if (callback != null && binder != null) {
             synchronized (mProcessingActionListeners) {
                 mProcessingActionListeners.add(binder, callback, callbackIdentifier);
             }
@@ -6210,9 +6210,9 @@ public class ClientModeImpl extends StateMachine {
     /**
      * Trigger network forget and provide status via the provided callback.
      */
-    public void forget(int netId, IBinder binder, @Nullable IActionListener callback,
+    public void forget(int netId, @Nullable IBinder binder, @Nullable IActionListener callback,
             int callbackIdentifier, int callingUid) {
-        if (callback != null) {
+        if (callback != null && binder != null) {
             synchronized (mProcessingActionListeners) {
                 mProcessingActionListeners.add(binder, callback, callbackIdentifier);
             }
diff --git a/service/java/com/android/server/wifi/WifiServiceImpl.java b/service/java/com/android/server/wifi/WifiServiceImpl.java
index 6bab1eafe..7f16bb34f 100644
--- a/service/java/com/android/server/wifi/WifiServiceImpl.java
+++ b/service/java/com/android/server/wifi/WifiServiceImpl.java
@@ -3252,10 +3252,6 @@ public class WifiServiceImpl extends BaseWifiService {
     @Override
     public void connect(WifiConfiguration config, int netId, IBinder binder,
             @Nullable IActionListener callback, int callbackIdentifier) {
-        // verify arguments
-        if (binder == null) {
-            throw new IllegalArgumentException("Binder must not be null");
-        }
         if (!isPrivileged(Binder.getCallingPid(), Binder.getCallingUid())) {
             throw new SecurityException(TAG + ": Permission denied");
         }
@@ -3273,10 +3269,6 @@ public class WifiServiceImpl extends BaseWifiService {
     @Override
     public void save(WifiConfiguration config, IBinder binder, @Nullable IActionListener callback,
             int callbackIdentifier) {
-        // verify arguments
-        if (binder == null) {
-            throw new IllegalArgumentException("Binder must not be null");
-        }
         if (!isPrivileged(Binder.getCallingPid(), Binder.getCallingUid())) {
             throw new SecurityException(TAG + ": Permission denied");
         }
@@ -3293,10 +3285,6 @@ public class WifiServiceImpl extends BaseWifiService {
     @Override
     public void forget(int netId, IBinder binder, @Nullable IActionListener callback,
             int callbackIdentifier) {
-        // verify arguments
-        if (binder == null) {
-            throw new IllegalArgumentException("Binder must not be null");
-        }
         if (!isPrivileged(Binder.getCallingPid(), Binder.getCallingUid())) {
             throw new SecurityException(TAG + ": Permission denied");
         }