Merge cherrypicks of [17104573] into security-aosp-qt-release. (b419bebc) · Commits · e / os / android_packages_services_Telecomm

src/com/android/server/telecom/ServiceBinder.java

+24 −1

Original line number	Diff line number	Diff line
		@@ -149,7 +149,6 @@ public abstract class ServiceBinder {
		Log.i(this, "Service bound %s", componentName);

		Log.addEvent(mCall, LogUtils.Events.CS_BOUND, componentName);
		mCall = null;

		// Unbind request was queued so unbind immediately.
		if (mIsBindingAborted) {
		@@ -191,6 +190,30 @@ public abstract class ServiceBinder {
		Log.endSession();
		}
		}

		/**
		* Handles the case where the {@link ConnectionService} we bound to returned a null binding.
		* We want to unbind from the service and cleanup and call resources at this time.
		* @param componentName The component of the {@link ConnectionService}.
		*/
		@Override
		public void onNullBinding(ComponentName componentName) {
		try {
		Log.startSession("SBC.oNB");
		synchronized (mLock) {
		Log.w(this, "Null binding %s", componentName);
		Log.addEvent(mCall, "NULL_BINDING", componentName);
		String componentStr = componentName == null ? "null" : componentName.toString();
		android.util.EventLog.writeEvent(0x534e4554, "211114016", -1, componentStr);
		logServiceDisconnected("onNullBinding");
		mContext.unbindService(this);
		clearAbort();
		handleFailedConnection();
		}
		} finally {
		Log.endSession();
		}
		}
		}

		private void handleDisconnect() {