Merge "Handle onBindingDied in AbstractRemoteService" into qt-dev (08ccf9bb) · Commits · e / os / android_frameworks_base

core/java/com/android/internal/infra/AbstractRemoteService.java

+17 −2

Original line number	Diff line number	Diff line
		@@ -344,13 +344,21 @@ public abstract class AbstractRemoteService<S extends AbstractRemoteService<S, I
		* {@link #getTimeoutIdleBindMillis() idle timeout} expires.
		*/
		protected void scheduleUnbind() {
		final long unbindDelay = getTimeoutIdleBindMillis();
		scheduleUnbind(true);
		}

		private void scheduleUnbind(boolean delay) {
		long unbindDelay = getTimeoutIdleBindMillis();

		if (unbindDelay <= 0) {
		if (unbindDelay <= PERMANENT_BOUND_TIMEOUT_MS) {
		if (mVerbose) Slog.v(mTag, "not scheduling unbind when value is " + unbindDelay);
		return;
		}

		if (!delay) {
		unbindDelay = 0;
		}

		cancelScheduledUnbind();
		// TODO(b/117779333): make sure it's unbound if the service settings changing (right now
		// it's not)
		@@ -462,9 +470,16 @@ public abstract class AbstractRemoteService<S extends AbstractRemoteService<S, I

		@Override
		public void onServiceDisconnected(ComponentName name) {
		if (mVerbose) Slog.v(mTag, "onServiceDisconnected()");
		mBinding = true;
		mService = null;
		}

		@Override
		public void onBindingDied(ComponentName name) {
		if (mVerbose) Slog.v(mTag, "onBindingDied()");
		scheduleUnbind(false);
		}
		}

		private boolean checkIfDestroyed() {