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

Commit 9446e270 authored by Android Build Merger (Role)'s avatar Android Build Merger (Role) Committed by Android (Google) Code Review
Browse files

Merge "Merge "Hide shared buffer mode/auto refresh on Surface" into oc-mr1-dev... 

Merge "Merge "Hide shared buffer mode/auto refresh on Surface" into oc-mr1-dev am: ee360259" into oc-mr1-dev-plus-aosp
parents 88b7016a 7d513b65

api/current.txt

+0 −4
Original line number Diff line number Diff line
@@ -45360,15 +45360,11 @@ package android.view { 
  public class Surface implements android.os.Parcelable {

    ctor public Surface(android.graphics.SurfaceTexture);

    method public int describeContents();

    method public boolean isAutoRefreshEnabled();

    method public boolean isSharedBufferModeEnabled();

    method public boolean isValid();

    method public android.graphics.Canvas lockCanvas(android.graphics.Rect) throws java.lang.IllegalArgumentException, android.view.Surface.OutOfResourcesException;

    method public android.graphics.Canvas lockHardwareCanvas();

    method public void readFromParcel(android.os.Parcel);

    method public void release();

    method public void setAutoRefreshEnabled(boolean);

    method public void setSharedBufferModeEnabled(boolean);

    method public deprecated void unlockCanvas(android.graphics.Canvas);

    method public void unlockCanvasAndPost(android.graphics.Canvas);

    method public void writeToParcel(android.os.Parcel, int);

api/system-current.txt

+0 −4
Original line number Diff line number Diff line
@@ -48962,15 +48962,11 @@ package android.view { 
  public class Surface implements android.os.Parcelable {

    ctor public Surface(android.graphics.SurfaceTexture);

    method public int describeContents();

    method public boolean isAutoRefreshEnabled();

    method public boolean isSharedBufferModeEnabled();

    method public boolean isValid();

    method public android.graphics.Canvas lockCanvas(android.graphics.Rect) throws java.lang.IllegalArgumentException, android.view.Surface.OutOfResourcesException;

    method public android.graphics.Canvas lockHardwareCanvas();

    method public void readFromParcel(android.os.Parcel);

    method public void release();

    method public void setAutoRefreshEnabled(boolean);

    method public void setSharedBufferModeEnabled(boolean);

    method public deprecated void unlockCanvas(android.graphics.Canvas);

    method public void unlockCanvasAndPost(android.graphics.Canvas);

    method public void writeToParcel(android.os.Parcel, int);

api/test-current.txt

+0 −4
Original line number Diff line number Diff line
@@ -45798,15 +45798,11 @@ package android.view { 
  public class Surface implements android.os.Parcelable {

    ctor public Surface(android.graphics.SurfaceTexture);

    method public int describeContents();

    method public boolean isAutoRefreshEnabled();

    method public boolean isSharedBufferModeEnabled();

    method public boolean isValid();

    method public android.graphics.Canvas lockCanvas(android.graphics.Rect) throws java.lang.IllegalArgumentException, android.view.Surface.OutOfResourcesException;

    method public android.graphics.Canvas lockHardwareCanvas();

    method public void readFromParcel(android.os.Parcel);

    method public void release();

    method public void setAutoRefreshEnabled(boolean);

    method public void setSharedBufferModeEnabled(boolean);

    method public deprecated void unlockCanvas(android.graphics.Canvas);

    method public void unlockCanvasAndPost(android.graphics.Canvas);

    method public void writeToParcel(android.os.Parcel, int);

core/java/android/view/Surface.java

+8 −0
Original line number Diff line number Diff line
@@ -659,6 +659,8 @@ public class Surface implements Parcelable { 
     *

     * @see #isSharedBufferModeEnabled()

     * @see #setAutoRefreshEnabled(boolean)

     *

     * @hide

     */

    public void setSharedBufferModeEnabled(boolean enabled) {

        if (mIsSharedBufferModeEnabled != enabled) {
@@ -676,6 +678,8 @@ public class Surface implements Parcelable { 
     * @return True if shared buffer mode is enabled on this surface, false otherwise

     *

     * @see #setSharedBufferModeEnabled(boolean)

     *

     * @hide

     */

    public boolean isSharedBufferModeEnabled() {

        return mIsSharedBufferModeEnabled;
@@ -699,6 +703,8 @@ public class Surface implements Parcelable { 
     *

     * @see #isAutoRefreshEnabled()

     * @see #setSharedBufferModeEnabled(boolean)

     *

     * @hide

     */

    public void setAutoRefreshEnabled(boolean enabled) {

        if (mIsAutoRefreshEnabled != enabled) {
@@ -713,6 +719,8 @@ public class Surface implements Parcelable { 


    /**

     * @return True if auto-refresh is enabled on this surface, false otherwise

     *

     * @hide

     */

    public boolean isAutoRefreshEnabled() {

        return mIsAutoRefreshEnabled;