Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b1f0c766 authored by Lucas Dupin's avatar Lucas Dupin
Browse files

EBS should always be able to toggle UiMode 

The fact that the UiMode permission is in place doesn't
mean that Battery Saver should not be able to toggle it.

Test: manually toggle setting
Change-Id: I9c73f04ef8d7f99fdffc896c5f6c001c87e17924
parent 7db3ae4f

services/core/java/com/android/server/UiModeManagerService.java

+4 −10
Original line number Diff line number Diff line
@@ -42,31 +42,25 @@ import android.os.ResultReceiver; 
import android.os.ServiceManager;

import android.os.ShellCallback;

import android.os.ShellCommand;

import android.os.SystemProperties;

import android.os.UserHandle;

import android.provider.Settings;

import android.service.dreams.Sandman;

import android.service.vr.IVrManager;

import android.service.vr.IVrStateCallbacks;

import android.text.TextUtils;

import android.util.Slog;



import java.io.File;

import java.io.FileDescriptor;

import java.io.PrintWriter;

import java.util.ArrayList;

import java.util.Collections;



import com.android.internal.R;

import com.android.internal.app.DisableCarModeActivity;

import com.android.internal.messages.nano.SystemMessageProto.SystemMessage;

import com.android.internal.notification.SystemNotificationChannels;

import com.android.internal.util.DumpUtils;

import com.android.server.power.ShutdownThread;

import com.android.server.twilight.TwilightListener;

import com.android.server.twilight.TwilightManager;

import com.android.server.twilight.TwilightState;



import java.io.FileDescriptor;

import java.io.PrintWriter;



final class UiModeManagerService extends SystemService {

    private static final String TAG = UiModeManager.class.getSimpleName();

    private static final boolean LOG = false;
@@ -466,7 +460,7 @@ final class UiModeManagerService extends SystemService { 
            uiMode |= mNightMode << 4;

        }



        if (mPowerSave && !mNightModeLocked) {

        if (mPowerSave) {

            uiMode &= ~Configuration.UI_MODE_NIGHT_NO;

            uiMode |= Configuration.UI_MODE_NIGHT_YES;

        }