commit 1a81c39a937934062511fb585edc350b687582b2
author Paul Jensen <pauljensen@google.com> Thu May 21 08:15:08 2015 -0400
committer Paul Jensen <pauljensen@google.com> Thu May 21 08:15:08 2015 -0400
tree 10dc179e1bd3292997b07a2c08b81a0e8738f4fc
parent c1a9436d27e41347e6063b1cfb77eaef7e191ca4

Null-check argument to ConnectivityManager.releaseNetworkRequest(PendingIntent)

Do this in ConnectivityService to prevent crashing framework.

Bug:21329396
Change-Id: Ifd9c970cd0da392d0bd5da9a9ae845fdf0b559b3

services/core/java/com/android/server/ConnectivityService.java

diff --git a/services/core/java/com/android/server/ConnectivityService.java b/services/core/java/com/android/server/ConnectivityService.java
index 7ac2655..edca4b8 100644
--- a/services/core/java/com/android/server/ConnectivityService.java
+++ b/services/core/java/com/android/server/ConnectivityService.java
@@ -3640,6 +3640,7 @@
 
     @Override
     public void releasePendingNetworkRequest(PendingIntent operation) {
+        checkNotNull(operation, "PendingIntent cannot be null.");
         mHandler.sendMessage(mHandler.obtainMessage(EVENT_RELEASE_NETWORK_REQUEST_WITH_INTENT,
                 getCallingUid(), 0, operation));
     }