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

Browse Source 
Change-Id: I0886007c4f60821b87bff68b30654302a6e603c7
This commit is contained in:
Automerger Merge Worker
2020-03-09 10:22:27 +00:00
parent 29701aa1bb 5580360ba8
commit 2694d3ca71
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -680,7 +680,9 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub {
} }
@Override @Override
public void onChange(boolean selfChange, Uri uri, @UserIdInt int userId) { public void onChange(boolean selfChange, Iterable<Uri> uris, int flags,
@UserIdInt int userId) {
for (Uri uri : uris) {
if (mFontScaleUri.equals(uri)) { if (mFontScaleUri.equals(uri)) {
updateFontScaleIfNeeded(userId); updateFontScaleIfNeeded(userId);
} else if (mHideErrorDialogsUri.equals(uri)) { } else if (mHideErrorDialogsUri.equals(uri)) {
@@ -690,6 +692,7 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub {
} }
} }
} }
}
/** Indicates that the method may be invoked frequently or is sensitive to performance. */ /** Indicates that the method may be invoked frequently or is sensitive to performance. */
@Target(ElementType.METHOD) @Target(ElementType.METHOD)