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

Commit 37e74a84 authored by Ryan Mitchell's avatar Ryan Mitchell Committed by android-build-merger
Browse files

Merge "Do not stop idmap2d after OMS initialization" into qt-r1-dev 

am: 3186b40e

Change-Id: I0374997faf945a2cd60179cf1c35a7fbcd255285
parents e6c9ed5f 3186b40e

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

+2 −2
Original line number Diff line number Diff line
@@ -129,11 +129,11 @@ class IdmapDaemon { 
        }

    }



    static void startIdmapService() {

    private static void startIdmapService() {

        SystemProperties.set("ctl.start", IDMAP_DAEMON);

    }



    static void stopIdmapService() {

    private static void stopIdmapService() {

        SystemProperties.set("ctl.stop", IDMAP_DAEMON);

    }

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

+0 −1
Original line number Diff line number Diff line
@@ -262,7 +262,6 @@ public final class OverlayManagerService extends SystemService { 


            initIfNeeded();

            onSwitchUser(UserHandle.USER_SYSTEM);

            IdmapDaemon.stopIdmapService();



            publishBinderService(Context.OVERLAY_SERVICE, mService);

            publishLocalService(OverlayManagerService.class, this);