From 6f94248ebff2f55b1fb5a78aaefbc20c63df7f35 Mon Sep 17 00:00:00 2001 From: Paul Jensen Date: Thu, 21 May 2015 08:15:08 -0400 Subject: [PATCH] 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 | 1 + 1 file changed, 1 insertion(+) diff --git a/services/core/java/com/android/server/ConnectivityService.java b/services/core/java/com/android/server/ConnectivityService.java index 7ac26556b9..edca4b8784 100644 --- a/services/core/java/com/android/server/ConnectivityService.java +++ b/services/core/java/com/android/server/ConnectivityService.java @@ -3640,6 +3640,7 @@ public class ConnectivityService extends IConnectivityManager.Stub @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)); }