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

api/current.txt

@@ -32987,7 +32987,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

@@ -316,6 +316,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) {