Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5580360b authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fix mismatched parameter of font scale change" into rvc-dev

parents 0bba033e 9c024d1b

services/core/java/com/android/server/wm/ActivityTaskManagerService.java

+9 −6
Original line number Diff line number Diff line
@@ -680,7 +680,9 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { 
        }



        @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)) {

                    updateFontScaleIfNeeded(userId);

                } 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. */

    @Target(ElementType.METHOD)