diff options
| author | Christopher Tate <ctate@google.com> | 2012-06-18 16:00:19 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-06-18 16:00:19 -0700 |
| commit | f8fd7ef97895524a0ce5735e19654549cb295cda (patch) | |
| tree | 1ab236b9611a1b4b2005e98273c4a02a159ff42d /core/java/android | |
| parent | 40af9c04c5e1abb1f3aaf74bba2697370c60359a (diff) | |
| parent | 79b3317b775810bac088b0998c48eb6506e2578c (diff) | |
| download | frameworks_base-f8fd7ef97895524a0ce5735e19654549cb295cda.zip frameworks_base-f8fd7ef97895524a0ce5735e19654549cb295cda.tar.gz frameworks_base-f8fd7ef97895524a0ce5735e19654549cb295cda.tar.bz2 | |
Merge "Fail immediately if bindService() is passed a null ServiceConnection"
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/app/ContextImpl.java | 6 | ||||
| -rw-r--r-- | core/java/android/content/Context.java | 3 |
2 files changed, 8 insertions, 1 deletions
diff --git a/core/java/android/app/ContextImpl.java b/core/java/android/app/ContextImpl.java index b902550..5e21403 100644 --- a/core/java/android/app/ContextImpl.java +++ b/core/java/android/app/ContextImpl.java @@ -1187,6 +1187,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); @@ -1217,6 +1220,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); diff --git a/core/java/android/content/Context.java b/core/java/android/content/Context.java index 7588cda..11b4906 100644 --- a/core/java/android/content/Context.java +++ b/core/java/android/content/Context.java @@ -1373,6 +1373,7 @@ public abstract class Context { * description (action, category, etc) to match an * {@link IntentFilter} published by a service. * @param conn Receives information as the service is started and stopped. + * This must be a valid ServiceConnection object; it must not be null. * @param flags Operation options for the binding. May be 0, * {@link #BIND_AUTO_CREATE}, {@link #BIND_DEBUG_UNBIND}, * {@link #BIND_NOT_FOREGROUND}, {@link #BIND_ABOVE_CLIENT}, @@ -1408,7 +1409,7 @@ public abstract class Context { * stop at any time. * * @param conn The connection interface previously supplied to - * bindService(). + * bindService(). This parameter must not be null. * * @see #bindService */ |