Merge \"More thorough cleansing of expired users\" into nyc-dev

am: 4f2b1b455e

Change-Id: I5714f73a9b90c0cb8fee653abf799374acfc6232
This commit is contained in:
Amith Yamasani
2016-06-16 00:24:14 +00:00
committed by android-build-merger
10 changed files with 108 additions and 31 deletions

View File

@@ -475,7 +475,7 @@ public final class SystemServer {
}
traceBeginAndSlog("StartUserManagerService");
ServiceManager.addService(Context.USER_SERVICE, UserManagerService.getInstance());
mSystemServiceManager.startService(UserManagerService.LifeCycle.class);
Trace.traceEnd(Trace.TRACE_TAG_SYSTEM_SERVER);
// Initialize attribute cache used to cache resources from packages.