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

Merge "Replace onUserSwithing() with onUserStarting() to handle updateOverlayForUser()"

Browse Source
This commit is contained in:
Brandon Liu
2023-02-08 22:50:38 +00:00
committed by Android (Google) Code Review
parent 851995c576 d990f2ca22
commit e36358f812
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
services/core/java/com/android/server/om/OverlayManagerService.java
View File

@@ -301,7 +301,7 @@ public final class OverlayManagerService extends SystemService {
&& shellPkgName.equals(overlayInfo.packageName));
initIfNeeded();
onSwitchUser(UserHandle.USER_SYSTEM);
onStartUser(UserHandle.USER_SYSTEM);
publishBinderService(Context.OVERLAY_SERVICE, mService);
publishLocalService(OverlayManagerService.class, this);
@@ -324,7 +324,7 @@ public final class OverlayManagerService extends SystemService {
final UserInfo userInfo = users.get(i);
if (!userInfo.supportsSwitchTo() && userInfo.id != UserHandle.USER_SYSTEM) {
// Initialize any users that can't be switched to, as their state would
// never be setup in onSwitchUser(). We will switch to the system user right
// never be setup in onStartUser(). We will switch to the system user right
// after this, and its state will be setup there.
updatePackageManagerLocked(mImpl.updateOverlaysForUser(users.get(i).id));
}
@@ -333,13 +333,13 @@ public final class OverlayManagerService extends SystemService {
}
@Override
public void onUserSwitching(@Nullable TargetUser from, @NonNull TargetUser to) {
onSwitchUser(to.getUserIdentifier());
public void onUserStarting(TargetUser user) {
onStartUser(user.getUserIdentifier());
}
private void onSwitchUser(@UserIdInt int newUserId) {
private void onStartUser(@UserIdInt int newUserId) {
try {
traceBegin(TRACE_TAG_RRO, "OMS#onSwitchUser " + newUserId);
traceBegin(TRACE_TAG_RRO, "OMS#onStartUser " + newUserId);
// ensure overlays in the settings are up-to-date, and propagate
// any asset changes to the rest of the system
synchronized (mLock) {