commit f66991ceafefd6b403bd0751cb2f514df9beb0fe
author Paul Jensen <pauljensen@google.com> Tue May 26 17:33:24 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue May 26 17:33:26 2015 +0000
tree 406d2b1781fe2aa5040f2667a5a7b5476db470a1
parent 04612b06920993a1b5b6356b495923ade4bb366c
parent 6f94248ebff2f55b1fb5a78aaefbc20c63df7f35

Merge "Null-check argument to ConnectivityManager.releaseNetworkRequest(PendingIntent)" into mnc-dev

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));
     }