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

Commit 58a1ca66 authored by Mathias Agopian's avatar Mathias Agopian Committed by Android (Google) Code Review
Browse files

Merge "split Surface in two classes: SurfaceControl and Surface"

parents a41b23d5 3866f0d5

core/java/android/app/UiAutomationConnection.java

+2 −2
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ import android.os.RemoteException; 
import android.os.ServiceManager;

import android.view.IWindowManager;

import android.view.InputEvent;

import android.view.Surface;

import android.view.SurfaceControl;

import android.view.accessibility.AccessibilityEvent;

import android.view.accessibility.IAccessibilityManager;
@@ -135,7 +135,7 @@ public final class UiAutomationConnection extends IUiAutomationConnection.Stub { 
        }

        final long identity = Binder.clearCallingIdentity();

        try {

            return Surface.screenshot(width, height);

            return SurfaceControl.screenshot(width, height);

        } finally {

            Binder.restoreCallingIdentity(identity);

        }

core/java/android/view/Choreographer.java

+1 −1
Original line number Diff line number Diff line
@@ -693,7 +693,7 @@ public final class Choreographer { 
            // At this time Surface Flinger won't send us vsyncs for secondary displays

            // but that could change in the future so let's log a message to help us remember

            // that we need to fix this.

            if (builtInDisplayId != Surface.BUILT_IN_DISPLAY_ID_MAIN) {

            if (builtInDisplayId != SurfaceControl.BUILT_IN_DISPLAY_ID_MAIN) {

                Log.d(TAG, "Received vsync from secondary display, but we don't support "

                        + "this case yet.  Choreographer needs a way to explicitly request "

                        + "vsync for a specific display to ensure it doesn't lose track "

core/java/android/view/DisplayEventReceiver.java

+2 −2
Original line number Diff line number Diff line
@@ -102,7 +102,7 @@ public abstract class DisplayEventReceiver { 
     * @param timestampNanos The timestamp of the pulse, in the {@link System#nanoTime()}

     * timebase.

     * @param builtInDisplayId The surface flinger built-in display id such as

     * {@link Surface#BUILT_IN_DISPLAY_ID_MAIN}.

     * {@link SurfaceControl#BUILT_IN_DISPLAY_ID_MAIN}.

     * @param frame The frame number.  Increases by one for each vertical sync interval.

     */

    public void onVsync(long timestampNanos, int builtInDisplayId, int frame) {
@@ -114,7 +114,7 @@ public abstract class DisplayEventReceiver { 
     * @param timestampNanos The timestamp of the event, in the {@link System#nanoTime()}

     * timebase.

     * @param builtInDisplayId The surface flinger built-in display id such as

     * {@link Surface#BUILT_IN_DISPLAY_ID_HDMI}.

     * {@link SurfaceControl#BUILT_IN_DISPLAY_ID_HDMI}.

     * @param connected True if the display is connected, false if it disconnected.

     */

    public void onHotplug(long timestampNanos, int builtInDisplayId, boolean connected) {

core/java/android/view/Surface.java

+65 −506

File changed.

Preview size limit exceeded, changes collapsed.

core/java/android/view/SurfaceControl.java

0 → 100644
+575 −0

File added.

Preview size limit exceeded, changes collapsed.