Merge "Fail immediately if bindService() is passed a null ServiceConnection" (f8fd7ef9) · Commits · e / os / android_frameworks_base

core/java/android/app/ContextImpl.java

+6 −0

Original line number	Diff line number	Diff line
		@@ -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);

+2 −1

Original line number	Diff line number	Diff line
		@@ -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
		*/