Merge "Ensure service unbind when receiving a null call screening service in onBind." (1115ecf1) · Commits · e / os / android_packages_services_Telecomm

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

+17 −0

Original line number	Diff line number	Diff line
		@@ -137,6 +137,23 @@ public class CallScreeningServiceHelper {
		"Cancelling outgoing call screen due to service disconnect.");
		}
		mFuture.complete(null);
		mContext.unbindService(this);
		} finally {
		Log.endSession();
		}
		}

		@Override
		public void onNullBinding(ComponentName name) {
		// No locking needed -- CompletableFuture only lets one thread call complete.
		Log.continueSession(mLoggingSession, "CSSH.oNB");
		try {
		if (!mFuture.isDone()) {
		Log.w(CallScreeningServiceHelper.this,
		"Cancelling outgoing call screen due to null binding.");
		}
		mFuture.complete(null);
		mContext.unbindService(this);
		} finally {
		Log.endSession();
		}

+2 −0

Original line number	Diff line number	Diff line
		@@ -236,12 +236,14 @@ public class CallScreeningServiceFilter extends CallFilter {
		public void onServiceDisconnected(ComponentName componentName) {
		mResultFuture.complete(mPriorStageResult);
		Log.i(this, "Service disconnected.");
		unbindCallScreeningService();
		}

		@Override
		public void onBindingDied(ComponentName name) {
		mResultFuture.complete(mPriorStageResult);
		Log.i(this, "Binding died.");
		unbindCallScreeningService();
		}

		@Override