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

Commit a5d7b1b7 authored by Android (Google) Code Review's avatar Android (Google) Code Review Committed by Android Git Automerger
Browse files

am 159e1a9a: Merge change 8883 into donut 

Merge commit '159e1a9a'

* commit '159e1a9a':
  fix [1973755] Surface.SURACE_FROZEN spelled SURACE_FROZEN
parents 2ec556dd 159e1a9a

api/current.xml

+12 −1
Original line number Diff line number Diff line
@@ -146779,7 +146779,7 @@ 
 value="2"

 static="true"

 final="true"

 deprecated="not deprecated"

 deprecated="deprecated"

 visibility="public"

>

</field>
@@ -146805,6 +146805,17 @@ 
 visibility="public"

>

</field>

<field name="SURFACE_FROZEN"

 type="int"

 transient="false"

 volatile="false"

 value="2"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="SURFACE_HIDDEN"

 type="int"

 transient="false"

core/java/android/view/Surface.java

+7 −1
Original line number Diff line number Diff line
@@ -107,6 +107,12 @@ public class Surface implements Parcelable { 
    public static final int SURFACE_HIDDEN    = 0x01;

    

    /** Freeze the surface. Equivalent to calling freeze() */ 

    public static final int SURFACE_FROZEN     = 0x02;



    /**

     * @deprecated use {@link #SURFACE_FROZEN} instead.

     */

    @Deprecated

    public static final int SURACE_FROZEN     = 0x02;



    /** Enable dithering when compositing this surface */