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

Commit a228e4f8 authored by Jack Palevich's avatar Jack Palevich Committed by Android (Google) Code Review
Browse files

Merge "Unhide GLSurfaceView.get/setPreserveEGLContextOnPause" into honeycomb

parents c098c1d3 75f2bc04

api/current.xml

+24 −0
Original line number Diff line number Diff line
@@ -136112,6 +136112,17 @@ 
 visibility="public"

>

</method>

<method name="getPreserveEGLContextOnPause"

 return="boolean"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="getRenderMode"

 return="int"

 abstract="false"
@@ -136283,6 +136294,19 @@ 
<parameter name="glWrapper" type="android.opengl.GLSurfaceView.GLWrapper">

</parameter>

</method>

<method name="setPreserveEGLContextOnPause"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="preserveOnPause" type="boolean">

</parameter>

</method>

<method name="setRenderMode"

 return="void"

 abstract="false"

opengl/java/android/opengl/GLSurfaceView.java

+0 −2
Original line number Diff line number Diff line
@@ -272,7 +272,6 @@ public class GLSurfaceView extends SurfaceView implements SurfaceHolder.Callback 
    }



    /**

     * @hide

     * Control whether the EGL context is preserved when the GLSurfaceView is paused and

     * resumed.

     * <p>
@@ -295,7 +294,6 @@ public class GLSurfaceView extends SurfaceView implements SurfaceHolder.Callback 
    }



    /**

     * @hide

     * @return true if the EGL context will be preserved when paused

     */

    public boolean getPreserveEGLContextOnPause() {