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

Merge "Fix mismatched parameter of font scale change" into rvc-dev am: 5580360ba8 am: 2694d3ca71

Browse Source 
Change-Id: I00b748e113635b7019c175fc138902237c6e7e89
This commit is contained in:
Automerger Merge Worker
2020-03-09 10:36:39 +00:00
parent e917a0139a 2694d3ca71
commit 0d0f22372f
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
services/core/java/com/android/server/wm/ActivityTaskManagerService.java
View File

@@ -680,12 +680,15 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub {
}
@Override
public void onChange(boolean selfChange, Uri uri, @UserIdInt int userId) {
if (mFontScaleUri.equals(uri)) {
updateFontScaleIfNeeded(userId);
} else if (mHideErrorDialogsUri.equals(uri)) {
synchronized (mGlobalLock) {
updateShouldShowDialogsLocked(getGlobalConfiguration());
public void onChange(boolean selfChange, Iterable<Uri> uris, int flags,
@UserIdInt int userId) {
for (Uri uri : uris) {
if (mFontScaleUri.equals(uri)) {
updateFontScaleIfNeeded(userId);
} else if (mHideErrorDialogsUri.equals(uri)) {
synchronized (mGlobalLock) {
updateShouldShowDialogsLocked(getGlobalConfiguration());
}
}
}
}