diff options
| author | Alan Viverette <alanv@google.com> | 2015-08-11 17:27:04 -0400 |
|---|---|---|
| committer | Alex Hills <ahills@google.com> | 2015-09-14 10:56:02 -0400 |
| commit | 3d2337eeb5c8b28bace281d049c5ca8cd13c8b70 (patch) | |
| tree | 3b81a0833a501bff2a45d168853872f06a7bc632 /services/java | |
| parent | 5a45dc960b42eae66661665ff9a6bcb7e4a02c16 (diff) | |
| download | frameworks_base-3d2337eeb5c8b28bace281d049c5ca8cd13c8b70.zip frameworks_base-3d2337eeb5c8b28bace281d049c5ca8cd13c8b70.tar.gz frameworks_base-3d2337eeb5c8b28bace281d049c5ca8cd13c8b70.tar.bz2 | |
Cherry-pick system theme rebase to fix square UI on round watches
Our system themes were based on configurations that were added post-
init of the system theme.
I96e695441543379e4d5fdf3cc6f18d9e6cf953b4 broke this, because there
was a race condition in the code for rebasing themes
If8fecde76d62738a8e55eddf898eafc468afdba2 (the cherry-picked commit)
fixes the race condition and adds the rebasing back in.
This change cherry picks If8fecde76d62738a8e55eddf898eafc468afdba2.
Bug:23387146
Change-Id: I0725028e48599fc6cd9731ae16c71474dd5827e5
Diffstat (limited to 'services/java')
| -rw-r--r-- | services/java/com/android/server/SystemServer.java | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java index 7dd16d1..3effe63 100644 --- a/services/java/com/android/server/SystemServer.java +++ b/services/java/com/android/server/SystemServer.java @@ -1047,6 +1047,12 @@ public final class SystemServer { w.getDefaultDisplay().getMetrics(metrics); context.getResources().updateConfiguration(config, metrics); + // The system context's theme may be configuration-dependent. + final Theme systemTheme = context.getTheme(); + if (systemTheme.getChangingConfigurations() != 0) { + systemTheme.rebase(); + } + try { // TODO: use boot phase mPowerManagerService.systemReady(mActivityManagerService.getAppOpsService()); |