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

Commit 2694d3ca authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

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

Change-Id: I0886007c4f60821b87bff68b30654302a6e603c7
parents 29701aa1 5580360b

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

+9 −6
Original line number Original line Diff line number Diff line
@@ -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)