commit e0c15a03406a072bf52efedf233707806b7ecba3
author Ryan Mitchell <rtmitchell@google.com> Fri Aug 16 13:21:26 2019 -0700
committer android-build-merger <android-build-merger@google.com> Fri Aug 16 13:21:26 2019 -0700
tree 8e7e1072df24d7687dc34f77ae11a6596933f867
parent 132d20c3f30254c7670c6890aeb19ae0bd8976d5
parent 70d103e8270c392441668722514ee7015a4732b2

Merge "Do not stop idmap2d after OMS initialization" into qt-r1-dev am: 3186b40edf
am: 70d103e827

Change-Id: I2fc13e4db5cece515844f1bce04b232724520ff1

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

diff --git a/services/core/java/com/android/server/om/IdmapDaemon.java b/services/core/java/com/android/server/om/IdmapDaemon.java
index 91824c3..20a4c75 100644
--- a/services/core/java/com/android/server/om/IdmapDaemon.java
+++ b/services/core/java/com/android/server/om/IdmapDaemon.java
@@ -129,11 +129,11 @@
         }
     }
 
-    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

diff --git a/services/core/java/com/android/server/om/OverlayManagerService.java b/services/core/java/com/android/server/om/OverlayManagerService.java
index ce95181..da69986 100644
--- a/services/core/java/com/android/server/om/OverlayManagerService.java
+++ b/services/core/java/com/android/server/om/OverlayManagerService.java
@@ -262,7 +262,6 @@
 
             initIfNeeded();
             onSwitchUser(UserHandle.USER_SYSTEM);
-            IdmapDaemon.stopIdmapService();
 
             publishBinderService(Context.OVERLAY_SERVICE, mService);
             publishLocalService(OverlayManagerService.class, this);