Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit '2d42f484494e4183c42114ce5918fc4592a33fb6':
  Hide Surface#lockHardwareCanvas DO NOT MERGE
This commit is contained in:
Justin Koh
2014-11-06 20:40:56 +00:00
committed by Android Git Automerger
parent 768344f73d 2d42f48449
commit 4ca342cdba
2 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/current.txt
View File

@@ -33407,7 +33407,6 @@ package android.view {
method public int describeContents(); method public int describeContents();
method public boolean isValid(); 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 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 readFromParcel(android.os.Parcel);
method public void release(); method public void release();
method public deprecated void unlockCanvas(android.graphics.Canvas); method public deprecated void unlockCanvas(android.graphics.Canvas);

1
core/java/android/view/Surface.java
View File

@@ -319,6 +319,7 @@ public class Surface implements Parcelable {
* @return A canvas for drawing into the surface. * @return A canvas for drawing into the surface.
* *
* @throws IllegalStateException If the canvas cannot be locked. * @throws IllegalStateException If the canvas cannot be locked.
* @hide
*/ */
public Canvas lockHardwareCanvas() { public Canvas lockHardwareCanvas() {
synchronized (mLock) { synchronized (mLock) {