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

This commit is contained in:
TreeHugger Robot
2017-08-16 22:49:49 +00:00
committed by Android (Google) Code Review
4 changed files with 8 additions and 12 deletions

View File

@@ -45234,15 +45234,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);

View File

@@ -48819,15 +48819,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);

View File

@@ -45672,15 +45672,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);

View File

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