Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Re-connect to the CDM service if process gets killed" into sc-dev

Browse Source
This commit is contained in:
Eugene Susla
2021-04-08 00:12:20 +00:00
committed by Android (Google) Code Review
parent 5a268a95cb a98efadb48
commit 4355ef953b
1 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java
View File

@@ -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_TIMEOUT_MS = 10 * 1000;
private static final long DEVICE_DISAPPEARED_UNBIND_TIMEOUT_MS = 10 * 60 * 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 boolean DEBUG = false;
private static final String LOG_TAG = "CompanionDeviceManagerService"; 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 // Service binding is managed manually based on corresponding device being nearby
return Long.MAX_VALUE; 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);
}
}; };
} }