Fix mismatched parameter of font scale change

Since commit d703253, the 3rd parameter of ContentObserver#onChange
(@hide) is changed from userId to flags.

Bug: 150939131
Fix: 150932077
Test: ConfigChangeTests#testChangeFontScaleRelaunch
Change-Id: If1eb8dd3c7bf574d4d5a23a739208975ec3c0e44
This commit is contained in:
Riddle Hsu
2020-03-09 16:10:07 +08:00
parent 34e727ec7f
commit 9c024d1bd5

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());
}
}
}
}