Merge "Don't update dark boot setting onStart" into qt-dev
diff --git a/services/core/java/com/android/server/UiModeManagerService.java b/services/core/java/com/android/server/UiModeManagerService.java
index 59589cd..bc7da3f 100644
--- a/services/core/java/com/android/server/UiModeManagerService.java
+++ b/services/core/java/com/android/server/UiModeManagerService.java
@@ -66,7 +66,6 @@
 
 import java.io.FileDescriptor;
 import java.io.PrintWriter;
-import java.util.Objects;
 
 final class UiModeManagerService extends SystemService {
     private static final String TAG = UiModeManager.class.getSimpleName();
@@ -334,12 +333,6 @@
             mNightMode = defaultNightMode;
         }
 
-        if (UserManager.get(context).isPrimaryUser()) {
-            final String newTheme = Integer.toString(mNightMode);
-            if (!Objects.equals(SystemProperties.get(SYSTEM_PROPERTY_DEVICE_THEME), mNightMode)) {
-                SystemProperties.set(SYSTEM_PROPERTY_DEVICE_THEME, newTheme);
-            }
-        }
         return oldNightMode != mNightMode;
     }