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

Commit 06da6d21 authored by Craig Donner's avatar Craig Donner Committed by android-build-merger
Browse files

Merge "Update HardwareBuffer API." into oc-dev am: 649040c7 

am: d5fcb3a4

Change-Id: I14b0606c3d7866f68f7b0e7a7458bb4af4236d0e
parents 215f1ed8 d5fcb3a4

api/current.txt

+3 −3
Original line number Diff line number Diff line
@@ -14754,16 +14754,16 @@ package android.hardware { 
    method public float getZ();

  }













  public final class HardwareBuffer implements android.os.Parcelable {













  public final class HardwareBuffer implements java.lang.AutoCloseable android.os.Parcelable {













    method public void close();















    method public static android.hardware.HardwareBuffer create(int, int, int, int, long);















    method public int describeContents();













    method public void destroy();















    method public int getFormat();















    method public int getHeight();















    method public int getLayers();















    method public long getUsage();















    method public int getWidth();













    method public boolean isDestroyed();













    method public boolean isClosed();















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















    field public static final int BLOB = 33; // 0x21















    field public static final android.os.Parcelable.Creator<android.hardware.HardwareBuffer> CREATOR;

























api/removed.txt



+5
−0






























Original line number
Diff line number
Diff line








@@ -126,6 +126,11 @@ package android.graphics {





























package android.hardware {





























  public final class HardwareBuffer implements java.lang.AutoCloseable android.os.Parcelable {













    method public deprecated void destroy();













    method public deprecated boolean isDestroyed();













  }





























  public final class SensorDirectChannel implements java.nio.channels.Channel {















    method public deprecated boolean isValid();















  }

































api/system-current.txt



+3
−3






























Original line number
Diff line number
Diff line








@@ -15528,16 +15528,16 @@ package android.hardware {













    method public float getZ();















  }



























  public final class HardwareBuffer implements android.os.Parcelable {













  public final class HardwareBuffer implements java.lang.AutoCloseable android.os.Parcelable {













    method public void close();















    method public static android.hardware.HardwareBuffer create(int, int, int, int, long);















    method public int describeContents();













    method public void destroy();















    method public int getFormat();















    method public int getHeight();















    method public int getLayers();















    method public long getUsage();















    method public int getWidth();













    method public boolean isDestroyed();













    method public boolean isClosed();















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















    field public static final int BLOB = 33; // 0x21















    field public static final android.os.Parcelable.Creator<android.hardware.HardwareBuffer> CREATOR;

























api/system-removed.txt



+5
−0






























Original line number
Diff line number
Diff line








@@ -124,6 +124,11 @@ package android.graphics {





























package android.hardware {





























  public final class HardwareBuffer implements java.lang.AutoCloseable android.os.Parcelable {













    method public deprecated void destroy();













    method public deprecated boolean isDestroyed();













  }





























  public final class SensorDirectChannel implements java.nio.channels.Channel {















    method public deprecated boolean isValid();















  }

































api/test-current.txt



+3
−3






























Original line number
Diff line number
Diff line








@@ -14799,16 +14799,16 @@ package android.hardware {













    method public float getZ();















  }



























  public final class HardwareBuffer implements android.os.Parcelable {













  public final class HardwareBuffer implements java.lang.AutoCloseable android.os.Parcelable {













    method public void close();















    method public static android.hardware.HardwareBuffer create(int, int, int, int, long);















    method public int describeContents();













    method public void destroy();















    method public int getFormat();















    method public int getHeight();















    method public int getLayers();















    method public long getUsage();















    method public int getWidth();













    method public boolean isDestroyed();













    method public boolean isClosed();















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















    field public static final int BLOB = 33; // 0x21















    field public static final android.os.Parcelable.Creator<android.hardware.HardwareBuffer> CREATOR;