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

Commit 168e07a6 authored by Chong Zhang's avatar Chong Zhang Committed by android-build-merger
Browse files

Merge \"Make sure fontScale in configuration sent to app is equal to global\" into nyc-dev

am: 7c669264

Change-Id: Ia4b4fc716a5d6e8146a1d13fe3ed750c7287e77d
parents 03ed2f83 7c669264
Loading
Loading
Loading
Loading
+9 −2
Original line number Diff line number Diff line
@@ -444,10 +444,17 @@ final class ActivityRecord {
            return;
        }
        try {
            // Make sure fontScale is always equal to global. For fullscreen apps, config is
            // the shared EMPTY config, which has default fontScale of 1.0. We don't want it
            // to be applied as an override config.
            Configuration overrideConfig = new Configuration(config);
            overrideConfig.fontScale = service.mConfiguration.fontScale;

            if (DEBUG_CONFIGURATION) Slog.v(TAG, "Sending new config to " + this + " " +
                    "reportToActivity=" + reportToActivity + " and config: " + config);
                    "reportToActivity=" + reportToActivity + " and config: " + overrideConfig);

            app.thread.scheduleActivityConfigurationChanged(
                    appToken, new Configuration(config), reportToActivity);
                    appToken, overrideConfig, reportToActivity);
        } catch (RemoteException e) {
            // If process died, whatever.
        }