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

Commit 43b63f0d authored by Ryan Mitchell's avatar Ryan Mitchell
Browse files

Swallow exception from failed idmap2d disable 

If the idmap daemon cannot be disabled for some reason, it is okay
to swallow the exception caused by failing to set "ctl.stop". Log a
warning instead.

Bug: 186761471
Test: builds
Change-Id: Iae07c9f9af6a0c07fd6d89d97452f0add19db56d
parent 72cd5f15

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 {