From 79b3317b775810bac088b0998c48eb6506e2578c Mon Sep 17 00:00:00 2001 From: Christopher Tate Date: Mon, 18 Jun 2012 14:54:21 -0700 Subject: Fail immediately if bindService() is passed a null ServiceConnection Or if unbindService() is passed one, naturally. Change-Id: Ib7f1f0b5e12c04e3affbcc9008612801081819d5 --- core/java/android/app/ContextImpl.java | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'core/java/android/app/ContextImpl.java') diff --git a/core/java/android/app/ContextImpl.java b/core/java/android/app/ContextImpl.java index 4c35a8c6f0d3..3a657a71b19d 100644 --- a/core/java/android/app/ContextImpl.java +++ b/core/java/android/app/ContextImpl.java @@ -1181,6 +1181,9 @@ class ContextImpl extends Context { @Override public boolean bindService(Intent service, ServiceConnection conn, int flags, int userId) { IServiceConnection sd; + if (conn == null) { + throw new IllegalArgumentException("connection is null"); + } if (mPackageInfo != null) { sd = mPackageInfo.getServiceDispatcher(conn, getOuterContext(), mMainThread.getHandler(), flags); @@ -1211,6 +1214,9 @@ class ContextImpl extends Context { @Override public void unbindService(ServiceConnection conn) { + if (conn == null) { + throw new IllegalArgumentException("connection is null"); + } if (mPackageInfo != null) { IServiceConnection sd = mPackageInfo.forgetServiceDispatcher( getOuterContext(), conn); -- cgit v1.2.3