commit d04c6d19a589a2a0f60650675438c59ac6900f45
author Alex Hills <ahills@google.com> Mon Sep 14 16:37:12 2015 -0400
committer Alex Hills <ahills@google.com> Mon Sep 14 17:03:58 2015 -0400
tree d95bcb8f52894ff373694bee7a40f1846fd5da51
parent e8c98b77854d39606960b0b6f5b5332c61e9a3d9
parent 693e11e56f5fc945d7af5d5213c6d844c7b88a5d

resolved conflicts for 693e11e5 to mnc-dr-dev-plus-aosp

Change-Id: I701841759a80f434a09b086492e817ca23a6a2e6

services/java/com/android/server/SystemServer.java

diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java
index 0e553b5..05d1ccd 100644
--- a/services/java/com/android/server/SystemServer.java
+++ b/services/java/com/android/server/SystemServer.java
@@ -1115,6 +1115,12 @@
         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();
+        }
+
         Trace.traceBegin(Trace.TRACE_TAG_SYSTEM_SERVER, "MakePowerManagerServiceReady");
         try {
             // TODO: use boot phase
@@ -1329,4 +1335,4 @@
         Trace.traceBegin(Trace.TRACE_TAG_SYSTEM_SERVER, name);
         Slog.i(TAG, name);
     }
-}
+}
\ No newline at end of file