Merge "Swallow exception from failed idmap2d disable" into sc-dev am: 551b038044

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14740750

Change-Id: I28a96256a33f5f0461056e87c160983a15a4b366
This commit is contained in:
TreeHugger Robot
2021-05-27 22:32:23 +00:00
committed by Automerger Merge Worker

View File

@@ -194,7 +194,13 @@ class IdmapDaemon {
}
private static void stopIdmapService() {
SystemService.stop(IDMAP_DAEMON);
try {
SystemService.stop(IDMAP_DAEMON);
} catch (RuntimeException e) {
// If the idmap daemon cannot be disabled for some reason, it is okay
// since we already finished invoking idmap.
Slog.w(TAG, "Failed to disable idmap2 daemon", e);
}
}
private Connection connect() throws TimeoutException, RemoteException {