Merge "Don't update dark boot setting onStart" into qt-dev

am: 2e967bf7e2

Change-Id: I3b9d5069fb0f97562dd848b40ea92a5c4dcd07fd
This commit is contained in:
Beverly
2019-06-24 08:12:03 -07:00
committed by android-build-merger

View File

@@ -66,7 +66,6 @@ import com.android.server.twilight.TwilightState;
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 @@ final class UiModeManagerService extends SystemService {
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;
}