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

Commit 26182b76 authored by Lubo Hristov's avatar Lubo Hristov Committed by android-build-team Robot
Browse files

Revert "Keep interrupts on when in battery saver mode" 

This reverts commit 6edeb187.

Reason for revert: cherry-picked into incorrect release branch

Bug: 134157254
Change-Id: I914e36b29ad2e0cc13619dbe8d32c8f0f9b77399
(cherry picked from commit 599a8ea144af095f530545c5b73dafe083068449)
parent defbab6e

packages/CarSystemUI/src/com/android/systemui/car/CarNotificationInterruptionStateProvider.java

+2 −4
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ import com.android.systemui.plugins.statusbar.StatusBarStateController; 
import com.android.systemui.statusbar.notification.NotificationFilter;

import com.android.systemui.statusbar.notification.NotificationInterruptionStateProvider;

import com.android.systemui.statusbar.notification.collection.NotificationEntry;

import com.android.systemui.statusbar.policy.BatteryController;



import javax.inject.Inject;

import javax.inject.Singleton;
@@ -35,9 +34,8 @@ public class CarNotificationInterruptionStateProvider extends 
    @Inject

    public CarNotificationInterruptionStateProvider(Context context,

            NotificationFilter filter,

            StatusBarStateController stateController,

            BatteryController batteryController) {

        super(context, filter, stateController, batteryController);

            StatusBarStateController stateController) {

        super(context, filter, stateController);

    }



    @Override

packages/CarSystemUI/src/com/android/systemui/statusbar/car/CarBatteryController.java

+0 −5
Original line number Diff line number Diff line
@@ -257,11 +257,6 @@ public class CarBatteryController extends BroadcastReceiver implements BatteryCo 
        return false;

    }



    @Override

    public boolean isAodPowerSave() {

        return false;

    }



    private void notifyBatteryLevelChanged() {

        for (int i = 0, size = mChangeCallbacks.size(); i < size; i++) {

            mChangeCallbacks.get(i)

packages/SystemUI/src/com/android/systemui/doze/DozeFactory.java

+1 −2
Original line number Diff line number Diff line
@@ -33,7 +33,6 @@ import com.android.systemui.keyguard.WakefulnessLifecycle; 
import com.android.systemui.plugins.FalsingManager;

import com.android.systemui.statusbar.phone.BiometricUnlockController;

import com.android.systemui.statusbar.phone.DozeParameters;

import com.android.systemui.statusbar.policy.BatteryController;

import com.android.systemui.util.AsyncSensorManager;

import com.android.systemui.util.wakelock.DelayedWakeLock;

import com.android.systemui.util.wakelock.WakeLock;
@@ -65,7 +64,7 @@ public class DozeFactory { 
                params);



        DozeMachine machine = new DozeMachine(wrappedService, config, wakeLock,

                wakefulnessLifecycle, Dependency.get(BatteryController.class));

                wakefulnessLifecycle);

        machine.setParts(new DozeMachine.Part[]{

                new DozePauser(handler, machine, alarmManager, params.getPolicy()),

                new DozeFalsingManagerAdapter(falsingManager),

packages/SystemUI/src/com/android/systemui/doze/DozeMachine.java

+1 −8
Original line number Diff line number Diff line
@@ -27,7 +27,6 @@ import com.android.internal.util.Preconditions; 
import com.android.systemui.keyguard.WakefulnessLifecycle;

import com.android.systemui.keyguard.WakefulnessLifecycle.Wakefulness;

import com.android.systemui.statusbar.phone.DozeParameters;

import com.android.systemui.statusbar.policy.BatteryController;

import com.android.systemui.util.Assert;

import com.android.systemui.util.wakelock.WakeLock;
@@ -122,7 +121,6 @@ public class DozeMachine { 
    private final WakeLock mWakeLock;

    private final AmbientDisplayConfiguration mConfig;

    private final WakefulnessLifecycle mWakefulnessLifecycle;

    private final BatteryController mBatteryController;

    private Part[] mParts;



    private final ArrayList<State> mQueuedRequests = new ArrayList<>();
@@ -131,13 +129,11 @@ public class DozeMachine { 
    private boolean mWakeLockHeldForCurrentState = false;



    public DozeMachine(Service service, AmbientDisplayConfiguration config,

            WakeLock wakeLock, WakefulnessLifecycle wakefulnessLifecycle,

            BatteryController batteryController) {

            WakeLock wakeLock, WakefulnessLifecycle wakefulnessLifecycle) {

        mDozeService = service;

        mConfig = config;

        mWakefulnessLifecycle = wakefulnessLifecycle;

        mWakeLock = wakeLock;

        mBatteryController = batteryController;

    }



    /** Initializes the set of {@link Part}s. Must be called exactly once after construction. */
@@ -320,9 +316,6 @@ public class DozeMachine { 
            Log.i(TAG, "Dropping pulse done because current state is already done: " + mState);

            return mState;

        }

        if (requestedState == State.DOZE_AOD && mBatteryController.isAodPowerSave()) {

            return State.DOZE;

        }

        if (requestedState == State.DOZE_REQUEST_PULSE && !mState.canPulse()) {

            Log.i(TAG, "Dropping pulse request because current state can't pulse: " + mState);

            return mState;

packages/SystemUI/src/com/android/systemui/doze/DozeTriggers.java

+3 −2
Original line number Diff line number Diff line
@@ -345,6 +345,7 @@ public class DozeTriggers implements DozeMachine.Part { 


    private void checkTriggersAtInit() {

        if (mUiModeManager.getCurrentModeType() == Configuration.UI_MODE_TYPE_CAR

                || mDozeHost.isPowerSaveActive()

                || mDozeHost.isBlockingDoze()

                || !mDozeHost.isProvisioned()) {

            mMachine.requestState(DozeMachine.State.FINISH);
@@ -573,8 +574,8 @@ public class DozeTriggers implements DozeMachine.Part { 


        @Override

        public void onPowerSaveChanged(boolean active) {

            if (mDozeHost.isPowerSaveActive()) {

                mMachine.requestState(DozeMachine.State.DOZE);

            if (active) {

                mMachine.requestState(DozeMachine.State.FINISH);

            }

        }

    };