From 6be533ef6c7d52cdd0f5eae47bf9512b759aa45a Mon Sep 17 00:00:00 2001 From: Chong Zhang Date: Fri, 17 Jun 2016 16:24:21 -0700 Subject: [PATCH] Make sure fontScale in configuration sent to app is equal to global We don't want the default value 1.0 from empty config to be applied as an override. bug: 29367672 Change-Id: Ia9947c24fa9435ba5b208eb9bd05e0b07b574015 --- .../java/com/android/server/am/ActivityRecord.java | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/services/core/java/com/android/server/am/ActivityRecord.java b/services/core/java/com/android/server/am/ActivityRecord.java index 3ccac9e2f1e49..ff1068e37da49 100755 --- a/services/core/java/com/android/server/am/ActivityRecord.java +++ b/services/core/java/com/android/server/am/ActivityRecord.java @@ -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. }