Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix 'associated' javadoc typos" am: 3fd2c5c435 am: 2e789841a4

Browse Source 
Change-Id: Iddb5675dced31eacb2cbffb76377eb6e3097655f
This commit is contained in:
Treehugger Robot
2020-05-12 23:07:26 +00:00
committed by Automerger Merge Worker
parent 1a305a0f10 2e789841a4
commit 67efc10f9d
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/view/Surface.java
View File

@@ -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);

2
core/java/android/view/SurfaceControl.java
View File

@@ -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.
*