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

Merge "Swallow exception from failed idmap2d disable" into sc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2021-05-27 22:30:18 +00:00
committed by Android (Google) Code Review
parent 6725b63305 43b63f0d4e
commit 551b038044
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/core/java/com/android/server/om/IdmapDaemon.java
View File

@@ -194,7 +194,13 @@ class IdmapDaemon {
} }
private static void stopIdmapService() { private static void stopIdmapService() {
try {
SystemService.stop(IDMAP_DAEMON); 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 { private Connection connect() throws TimeoutException, RemoteException {