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

Commit 4ccb823a authored by Jeff Brown's avatar Jeff Brown
Browse files

Refactor display manager service to new pattern. 

Transform DisplayManagerService into a SystemService and start cleaning
up other local services that it uses from window manager and input manager.

Clean up service thread initialization.

Remove unnecessary static variables from ActivityManagerService.

It's starting to become clear that we really need a better way to manage
service dependencies.  Boot phases don't quite cut it.

Change-Id: If319dbd7cbfbd4812fe55ece969e818d4b20755b
parent 6f357d32

core/java/android/hardware/display/DisplayManagerInternal.java

0 → 100644
+109 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2014 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.hardware.display;



import android.view.DisplayInfo;



/**

 * Display manager local system service interface.

 *

 * @hide Only for use within the system server.

 */

public abstract class DisplayManagerInternal {

    /**

     * Called by the power manager to blank all displays.

     */

    public abstract void blankAllDisplaysFromPowerManager();



    /**

     * Called by the power manager to unblank all displays.

     */

    public abstract void unblankAllDisplaysFromPowerManager();



    /**

     * Returns information about the specified logical display.

     *

     * @param displayId The logical display id.

     * @return The logical display info, or null if the display does not exist.  The

     * returned object must be treated as immutable.

     */

    public abstract DisplayInfo getDisplayInfo(int displayId);



    /**

     * Registers a display transaction listener to provide the client a chance to

     * update its surfaces within the same transaction as any display layout updates.

     *

     * @param listener The listener to register.

     */

    public abstract void registerDisplayTransactionListener(DisplayTransactionListener listener);



    /**

     * Unregisters a display transaction listener to provide the client a chance to

     * update its surfaces within the same transaction as any display layout updates.

     *

     * @param listener The listener to unregister.

     */

    public abstract void unregisterDisplayTransactionListener(DisplayTransactionListener listener);



    /**

     * Overrides the display information of a particular logical display.

     * This is used by the window manager to control the size and characteristics

     * of the default display.  It is expected to apply the requested change

     * to the display information synchronously so that applications will immediately

     * observe the new state.

     *

     * NOTE: This method must be the only entry point by which the window manager

     * influences the logical configuration of displays.

     *

     * @param displayId The logical display id.

     * @param info The new data to be stored.

     */

    public abstract void setDisplayInfoOverrideFromWindowManager(

            int displayId, DisplayInfo info);



    /**

     * Called by the window manager to perform traversals while holding a

     * surface flinger transaction.

     */

    public abstract void performTraversalInTransactionFromWindowManager();



    /**

     * Tells the display manager whether there is interesting unique content on the

     * specified logical display.  This is used to control automatic mirroring.

     * <p>

     * If the display has unique content, then the display manager arranges for it

     * to be presented on a physical display if appropriate.  Otherwise, the display manager

     * may choose to make the physical display mirror some other logical display.

     * </p>

     *

     * @param displayId The logical display id to update.

     * @param hasContent True if the logical display has content.

     * @param inTraversal True if called from WindowManagerService during a window traversal

     * prior to call to performTraversalInTransactionFromWindowManager.

     */

    public abstract void setDisplayHasContent(int displayId, boolean hasContent,

            boolean inTraversal);



    /**

     * Called within a Surface transaction whenever the size or orientation of a

     * display may have changed.  Provides an opportunity for the client to

     * update the position of its surfaces as part of the same transaction.

     */

    public interface DisplayTransactionListener {

        void onDisplayTransaction();

    }

}

services/core/java/com/android/server/display/DisplayViewport.java→core/java/android/hardware/display/DisplayViewport.java

+3 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
 * limitations under the License.

 */



package com.android.server.display;

package android.hardware.display;



import android.graphics.Rect;
@@ -25,6 +25,8 @@ import android.graphics.Rect; 
 * This information is used by the input system to translate touch input from

 * physical display coordinates into logical display coordinates.

 * </p>

 *

 * @hide Only for use within the system server.

 */

public final class DisplayViewport {

    // True if this viewport is valid.

core/java/android/hardware/input/InputManagerInternal.java

0 → 100644
+33 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2014 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.hardware.input;



import android.hardware.display.DisplayViewport;



/**

 * Input manager local system service interface.

 *

 * @hide Only for use within the system server.

 */

public abstract class InputManagerInternal {

    /**

     * Sets information about the displays as needed by the input system.

     * The input system should copy this information if required.

     */

    public abstract void setDisplayViewports(DisplayViewport defaultViewport,

            DisplayViewport externalTouchViewport);

}

core/java/android/os/PowerManagerInternal.java

+5 −5
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ import android.view.WindowManagerPolicy; 
 *

 * @hide Only for use within the system server.

 */

public interface PowerManagerInternal {

public abstract class PowerManagerInternal {

    /**

     * Used by the window manager to override the screen brightness based on the

     * current foreground activity.
@@ -32,7 +32,7 @@ public interface PowerManagerInternal { 
     *

     * @param brightness The overridden brightness, or -1 to disable the override.

     */

    public void setScreenBrightnessOverrideFromWindowManager(int brightness);

    public abstract void setScreenBrightnessOverrideFromWindowManager(int brightness);



    /**

     * Used by the window manager to override the button brightness based on the
@@ -42,7 +42,7 @@ public interface PowerManagerInternal { 
     *

     * @param brightness The overridden brightness, or -1 to disable the override.

     */

    public void setButtonBrightnessOverrideFromWindowManager(int brightness);

    public abstract void setButtonBrightnessOverrideFromWindowManager(int brightness);



    /**

     * Used by the window manager to override the user activity timeout based on the
@@ -53,8 +53,8 @@ public interface PowerManagerInternal { 
     *

     * @param timeoutMillis The overridden timeout, or -1 to disable the override.

     */

    public void setUserActivityTimeoutOverrideFromWindowManager(long timeoutMillis);

    public abstract void setUserActivityTimeoutOverrideFromWindowManager(long timeoutMillis);



    // TODO: Remove this and retrieve as a local service instead.

    public void setPolicy(WindowManagerPolicy policy);

    public abstract void setPolicy(WindowManagerPolicy policy);

}

services/core/java/com/android/server/display/DisplayTransactionListener.java→core/java/android/view/WindowManagerInternal.java

+15 −8
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2012 The Android Open Source Project

 * Copyright (C) 2014 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.
@@ -14,13 +14,20 @@ 
 * limitations under the License.

 */



package com.android.server.display;

package android.view;



import android.hardware.display.DisplayManagerInternal;



/**

 * Window manager local system service interface.

 *

 * @hide Only for use within the system server.

 */

public abstract class WindowManagerInternal {

    /**

 * Called within a Surface transaction whenever the size or orientation of a

 * display may have changed.  Provides an opportunity for the client to

 * update the position of its surfaces as part of the same transaction.

     * Request that the window manager call

     * {@link DisplayManagerInternal#performTraversalInTransactionFromWindowManager}

     * within a surface transaction at a later time.

     */

public interface DisplayTransactionListener {

    void onDisplayTransaction();

    public abstract void requestTraversalFromDisplayManager();

}
 
 No newline at end of file