drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am aea3b581: Merge "Remove hidden API setSurfaceTexture."

Browse Source 
* commit 'aea3b5816d8461fcbc4a384874a1a073ecdeafcf':
  Remove hidden API setSurfaceTexture.
This commit is contained in:
Tim Murray
2014-02-03 14:41:00 -08:00
committed by Android Git Automerger
parent 85ee57d1ae aea3b5816d
commit 9bad32c383
1 changed files with 5 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
graphics/java/android/renderscript/Allocation.java
View File

@ -24,7 +24,6 @@ import android.content.res.AssetManager;
import android.graphics.Bitmap; import android.graphics.Bitmap;
import android.graphics.BitmapFactory; import android.graphics.BitmapFactory;
import android.view.Surface; import android.view.Surface;
import android.graphics.SurfaceTexture;
import android.util.Log; import android.util.Log;
import android.util.TypedValue; import android.util.TypedValue;
import android.graphics.Canvas; import android.graphics.Canvas;
@ -127,17 +126,17 @@ public class Allocation extends BaseObj {
public static final int USAGE_GRAPHICS_RENDER_TARGET = 0x0010; public static final int USAGE_GRAPHICS_RENDER_TARGET = 0x0010;
/** /**
* The Allocation will be used as a {@link android.graphics.SurfaceTexture} * The Allocation will be used as a {@link android.view.Surface}
* consumer. This usage will cause the Allocation to be created as * consumer. This usage will cause the Allocation to be created
* read-only. * as read-only.
* *
*/ */
public static final int USAGE_IO_INPUT = 0x0020; public static final int USAGE_IO_INPUT = 0x0020;
/** /**
* The Allocation will be used as a {@link android.graphics.SurfaceTexture} * The Allocation will be used as a {@link android.view.Surface}
* producer. The dimensions and format of the {@link * producer. The dimensions and format of the {@link
* android.graphics.SurfaceTexture} will be forced to those of the * android.view.Surface} will be forced to those of the
* Allocation. * Allocation.
* *
*/ */
@ -1546,13 +1545,6 @@ public class Allocation extends BaseObj {
return mRS.nAllocationGetSurface(getID(mRS)); return mRS.nAllocationGetSurface(getID(mRS));
} }
/**
* @hide
*/
public void setSurfaceTexture(SurfaceTexture st) {
setSurface(new Surface(st));
}
/** /**
* Associate a {@link android.view.Surface} with this Allocation. This * Associate a {@link android.view.Surface} with this Allocation. This
* operation is only valid for Allocations with {@link #USAGE_IO_OUTPUT}. * operation is only valid for Allocations with {@link #USAGE_IO_OUTPUT}.