Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Handle user create failure correctly for lifecycle atom." into rvc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2020-06-18 21:32:00 +00:00
committed by Android (Google) Code Review
parent 29db7a6a62 9628953e14
commit 22e9ee7459
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
services/core/java/com/android/server/pm/UserManagerService.java
View File

@@ -3291,11 +3291,13 @@ public class UserManagerService extends IUserManager.Stub {
final TimingsTraceAndSlog t = new TimingsTraceAndSlog(); final TimingsTraceAndSlog t = new TimingsTraceAndSlog();
t.traceBegin("createUser-" + flags); t.traceBegin("createUser-" + flags);
final long sessionId = logUserCreateJourneyBegin(nextProbableUserId, userType, flags); final long sessionId = logUserCreateJourneyBegin(nextProbableUserId, userType, flags);
UserInfo newUser = null;
try { try {
return createUserInternalUncheckedNoTracing(name, userType, flags, parentId, newUser = createUserInternalUncheckedNoTracing(name, userType, flags, parentId,
preCreate, disallowedPackages, t); preCreate, disallowedPackages, t);
return newUser;
} finally { } finally {
logUserCreateJourneyFinish(sessionId, nextProbableUserId); logUserCreateJourneyFinish(sessionId, nextProbableUserId, newUser != null);
t.traceEnd(); t.traceEnd();
} }
} }
@@ -3314,10 +3316,11 @@ public class UserManagerService extends IUserManager.Stub {
return sessionId; return sessionId;
} }
private void logUserCreateJourneyFinish(long sessionId, @UserIdInt int userId) { private void logUserCreateJourneyFinish(long sessionId, @UserIdInt int userId, boolean finish) {
FrameworkStatsLog.write(FrameworkStatsLog.USER_LIFECYCLE_EVENT_OCCURRED, sessionId, userId, FrameworkStatsLog.write(FrameworkStatsLog.USER_LIFECYCLE_EVENT_OCCURRED, sessionId, userId,
FrameworkStatsLog.USER_LIFECYCLE_EVENT_OCCURRED__EVENT__CREATE_USER, FrameworkStatsLog.USER_LIFECYCLE_EVENT_OCCURRED__EVENT__CREATE_USER,
FrameworkStatsLog.USER_LIFECYCLE_EVENT_OCCURRED__STATE__FINISH); finish ? FrameworkStatsLog.USER_LIFECYCLE_EVENT_OCCURRED__STATE__FINISH
: FrameworkStatsLog.USER_LIFECYCLE_EVENT_OCCURRED__STATE__NONE);
} }
private UserInfo createUserInternalUncheckedNoTracing(@Nullable String name, private UserInfo createUserInternalUncheckedNoTracing(@Nullable String name,