Merge "Re-connect to the CDM service if process gets killed" into sc-dev (4355ef95) · Commits · e / os / android_frameworks_base

services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java

+10 −0

Original line number	Diff line number	Diff line
		@@ -154,6 +154,8 @@ public class CompanionDeviceManagerService extends SystemService implements Bind
		private static final long DEVICE_DISAPPEARED_TIMEOUT_MS = 10 * 1000;
		private static final long DEVICE_DISAPPEARED_UNBIND_TIMEOUT_MS = 10 * 60 * 1000;

		private static final long DEVICE_LISTENER_DIED_REBIND_TIMEOUT_MS = 10 * 1000;

		private static final boolean DEBUG = false;
		private static final String LOG_TAG = "CompanionDeviceManagerService";

		@@ -1131,6 +1133,14 @@ public class CompanionDeviceManagerService extends SystemService implements Bind
		// Service binding is managed manually based on corresponding device being nearby
		return Long.MAX_VALUE;
		}

		@Override
		public void binderDied() {
		super.binderDied();

		// Re-connect to the service if process gets killed
		mMainHandler.postDelayed(this::connect, DEVICE_LISTENER_DIED_REBIND_TIMEOUT_MS);
		}
		};
		}