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

Commit 2d42f484 authored by Justin Koh's avatar Justin Koh Committed by Android Git Automerger
Browse files

am b8038d58: Merge "Hide Surface#lockHardwareCanvas DO NOT MERGE" into lmp-sprout-dev 

* commit 'b8038d58':
  Hide Surface#lockHardwareCanvas DO NOT MERGE
parents 012849f4 b8038d58

api/current.txt

+0 −1
Original line number Diff line number Diff line
@@ -33407,7 +33407,6 @@ package android.view { 
    method public int describeContents();

    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 deprecated void unlockCanvas(android.graphics.Canvas);

core/java/android/view/Surface.java

+1 −0
Original line number Diff line number Diff line
@@ -319,6 +319,7 @@ public class Surface implements Parcelable { 
     * @return A canvas for drawing into the surface.

     *

     * @throws IllegalStateException If the canvas cannot be locked.

     * @hide

     */

    public Canvas lockHardwareCanvas() {

        synchronized (mLock) {