Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7acbcbcd authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

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

Merge "Swallow exception from failed idmap2d disable" into sc-dev am: 551b0380 am: 752784eb am: 1878d52c

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

Change-Id: If98d7b01739ada193de007b7480e30b5b8744354
parents 0affd996 1878d52c

services/core/java/com/android/server/om/IdmapDaemon.java

+7 −1
Original line number Diff line number Diff line
@@ -194,7 +194,13 @@ class IdmapDaemon { 
    }



    private static void stopIdmapService() {

        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 {