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

Commit 5d6443bf authored by Jeff Brown's avatar Jeff Brown
Browse files

Set initial screen brightness earlier in the boot process. 

Previously we had to wait for systemReady before setting the brightness
due to the order in which the display power controller was initialized.
Unfortunately it could take us a rather long time to reach that stage,
particularly after an OTA where the screen would remain at maximum
brightness for minutes while "Optimizing Apps".

This change moves the brightness backlight setting code deeper
into the display manager which has a couple of nice side-benefits
in that it now becomes much easier to coordinate display power mode
changes with display backlight changes.  So this change also resolves
some issued with changing the backlight while in DOZE_SUSPEND and
ensuring that backlight changes generally end up being performed
before executing a power mode change except in the case where the
display needs to come out of suspend first.  (So now the backlight
will be set before entering DOZE from the ON state.)

Deleted some dead code in LightService which was in the way.

Bug: 19029490
Change-Id: I494b5223e676248daf2ff8be3ec338845977f73c
parent 834a91dd

Android.mk

+0 −1
Original line number Diff line number Diff line
@@ -195,7 +195,6 @@ LOCAL_SRC_FILES += \ 
	core/java/android/os/IBatteryPropertiesListener.aidl \

	core/java/android/os/IBatteryPropertiesRegistrar.aidl \

	core/java/android/os/ICancellationSignal.aidl \

	core/java/android/os/IHardwareService.aidl \

	core/java/android/os/IMessenger.aidl \

	core/java/android/os/INetworkActivityListener.aidl \

	core/java/android/os/INetworkManagementService.aidl \

core/java/android/os/IHardwareService.aidl

deleted100644 → 0
+0 −26
Original line number Diff line number Diff line 
/**

 * Copyright (c) 2007, The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *     http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package android.os;



/** {@hide} */

interface IHardwareService

{

    // obsolete flashlight support

    boolean getFlashlightEnabled();

    void setFlashlightEnabled(boolean on);

}

services/core/java/com/android/server/display/DisplayBlanker.java

+1 −1
Original line number Diff line number Diff line
@@ -20,5 +20,5 @@ package com.android.server.display; 
 * Interface used to update the actual display state.

 */

public interface DisplayBlanker {

    void requestDisplayState(int state);

    void requestDisplayState(int state, int brightness);

}

services/core/java/com/android/server/display/DisplayDevice.java

+3 −1
Original line number Diff line number Diff line
@@ -118,10 +118,12 @@ abstract class DisplayDevice { 
    /**

     * Sets the display state, if supported.

     *

     * @param state The new display state.

     * @param brightness The new display brightness.

     * @return A runnable containing work to be deferred until after we have

     * exited the critical section, or null if none.

     */

    public Runnable requestDisplayStateLocked(int state) {

    public Runnable requestDisplayStateLocked(int state, int brightness) {

        return null;

    }

services/core/java/com/android/server/display/DisplayManagerService.java

+38 −10
Original line number Diff line number Diff line
@@ -40,11 +40,13 @@ import android.os.IBinder; 
import android.os.IBinder.DeathRecipient;

import android.os.Looper;

import android.os.Message;

import android.os.PowerManager;

import android.os.Process;

import android.os.RemoteException;

import android.os.ServiceManager;

import android.os.SystemClock;

import android.os.SystemProperties;

import android.os.Trace;

import android.text.TextUtils;

import android.util.Slog;

import android.util.SparseArray;
@@ -179,7 +181,11 @@ public final class DisplayManagerService extends SystemService { 


    // The overall display state, independent of changes that might influence one

    // display or another in particular.

    private int mGlobalDisplayState = Display.STATE_UNKNOWN;

    private int mGlobalDisplayState = Display.STATE_ON;



    // The overall display brightness.

    // For now, this only applies to the built-in display but we may split it up eventually.

    private int mGlobalDisplayBrightness = PowerManager.BRIGHTNESS_DEFAULT;



    // Set to true when there are pending display changes that have yet to be applied

    // to the surface flinger state.
@@ -226,6 +232,9 @@ public final class DisplayManagerService extends SystemService { 
        mUiHandler = UiThread.getHandler();

        mDisplayAdapterListener = new DisplayAdapterListener();

        mSingleDisplayDemoMode = SystemProperties.getBoolean("persist.demo.singledisplay", false);



        PowerManager pm = (PowerManager) mContext.getSystemService(Context.POWER_SERVICE);

        mGlobalDisplayBrightness = pm.getDefaultScreenBrightnessSetting();

    }



    @Override
@@ -322,17 +331,35 @@ public final class DisplayManagerService extends SystemService { 
        }

    }



    private void requestGlobalDisplayStateInternal(int state) {

    private void requestGlobalDisplayStateInternal(int state, int brightness) {

        if (state == Display.STATE_UNKNOWN) {

            state = Display.STATE_ON;

        }

        if (state == Display.STATE_OFF) {

            brightness = PowerManager.BRIGHTNESS_OFF;

        } else if (brightness < 0) {

            brightness = PowerManager.BRIGHTNESS_DEFAULT;

        } else if (brightness > PowerManager.BRIGHTNESS_ON) {

            brightness = PowerManager.BRIGHTNESS_ON;

        }



        synchronized (mTempDisplayStateWorkQueue) {

            try {

                // Update the display state within the lock.

                synchronized (mSyncRoot) {

                    if (mGlobalDisplayState != state) {

                    if (mGlobalDisplayState == state

                            && mGlobalDisplayBrightness == brightness) {

                        return; // no change

                    }



                    Trace.traceBegin(Trace.TRACE_TAG_POWER, "requestGlobalDisplayState("

                            + Display.stateToString(state)

                            + ", brightness=" + brightness + ")");

                    mGlobalDisplayState = state;

                    mGlobalDisplayBrightness = brightness;

                    updateGlobalDisplayStateLocked(mTempDisplayStateWorkQueue);

                    scheduleTraversalLocked(false);

                }

                }



                // Setting the display power state can take hundreds of milliseconds

                // to complete so we defer the most expensive part of the work until
@@ -341,6 +368,7 @@ public final class DisplayManagerService extends SystemService { 
                for (int i = 0; i < mTempDisplayStateWorkQueue.size(); i++) {

                    mTempDisplayStateWorkQueue.get(i).run();

                }

                Trace.traceEnd(Trace.TRACE_TAG_POWER);

            } finally {

                mTempDisplayStateWorkQueue.clear();

            }
@@ -708,7 +736,7 @@ public final class DisplayManagerService extends SystemService { 
        // by the display power controller (if known).

        DisplayDeviceInfo info = device.getDisplayDeviceInfoLocked();

        if ((info.flags & DisplayDeviceInfo.FLAG_NEVER_BLANK) == 0) {

            return device.requestDisplayStateLocked(mGlobalDisplayState);

            return device.requestDisplayStateLocked(mGlobalDisplayState, mGlobalDisplayBrightness);

        }

        return null;

    }
@@ -1462,16 +1490,16 @@ public final class DisplayManagerService extends SystemService { 
            synchronized (mSyncRoot) {

                DisplayBlanker blanker = new DisplayBlanker() {

                    @Override

                    public void requestDisplayState(int state) {

                    public void requestDisplayState(int state, int brightness) {

                        // The order of operations is important for legacy reasons.

                        if (state == Display.STATE_OFF) {

                            requestGlobalDisplayStateInternal(state);

                            requestGlobalDisplayStateInternal(state, brightness);

                        }



                        callbacks.onDisplayStateChange(state);



                        if (state != Display.STATE_OFF) {

                            requestGlobalDisplayStateInternal(state);

                            requestGlobalDisplayStateInternal(state, brightness);

                        }

                    }

                };