Merge "Performance regression on window switching"

1 files changed, 2 insertions, 3 deletions

diff --git a/services/core/java/com/android/server/UiModeManagerService.java b/services/core/java/com/android/server/UiModeManagerService.java
index b5702541432a..b1e2c0fe9586 100644
--- a/services/core/java/com/android/server/UiModeManagerService.java
+++ b/services/core/java/com/android/server/UiModeManagerService.java
@@ -866,14 +866,13 @@ final class UiModeManagerService extends SystemService {
         if (!mHoldingConfiguration) {
             mConfiguration.uiMode = uiMode;
         }
-        // load splash screen instead of screenshot
-        mWindowManager.clearSnapshotCache();
     }
 
     private void sendConfigurationLocked() {
         if (mSetUiMode != mConfiguration.uiMode) {
             mSetUiMode = mConfiguration.uiMode;
-
+            // load splash screen instead of screenshot
+            mWindowManager.clearSnapshotCache();
             try {
                 ActivityTaskManager.getService().updateConfiguration(mConfiguration);
             } catch (RemoteException e) {