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

Commit 67efc10f authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix 'associated' javadoc typos" am: 3fd2c5c4 am: 2e789841 

Change-Id: Iddb5675dced31eacb2cbffb76377eb6e3097655f
parents 1a305a0f 2e789841

core/java/android/view/Surface.java

+2 −2
Original line number Diff line number Diff line
@@ -218,12 +218,12 @@ public class Surface implements Parcelable { 
    }



    /**

     * Create a Surface assosciated with a given {@link SurfaceControl}. Buffers submitted to this

     * Create a Surface associated with a given {@link SurfaceControl}. Buffers submitted to this

     * surface will be displayed by the system compositor according to the parameters

     * specified by the control. Multiple surfaces may be constructed from one SurfaceControl,

     * but only one can be connected (e.g. have an active EGL context) at a time.

     *

     * @param from The SurfaceControl to assosciate this Surface with

     * @param from The SurfaceControl to associate this Surface with

     */

    public Surface(@NonNull SurfaceControl from) {

        copyFrom(from);

core/java/android/view/SurfaceControl.java

+1 −1
Original line number Diff line number Diff line
@@ -2413,7 +2413,7 @@ public final class SurfaceControl implements Parcelable { 
        }



        /**

         * Specify how the buffer assosciated with this Surface is mapped in to the

         * Specify how the buffer associated with this Surface is mapped in to the

         * parent coordinate space. The source frame will be scaled to fit the destination

         * frame, after being rotated according to the orientation parameter.

         *