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

am b43bc047: Merge "Change flags to use int instead of long." into lmp-preview-dev

Browse Source 
* commit 'b43bc0475490fe2a20c2ddeed1c34b55b8f8a152':
  Change flags to use int instead of long.
This commit is contained in:
Tim Murray
2014-06-06 22:41:22 +00:00
committed by Android Git Automerger
parent a18d0acc1f 7fa0e6bc69
commit 08d3775cbe
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
rs/java/android/renderscript/RenderScript.java
View File

@ -64,23 +64,23 @@ public class RenderScript {
static Method registerNativeFree;
/*
* Context creation flag which specifies a normal context.
* Context creation flag that specifies a normal context.
*/
public static final long CREATE_FLAG_NONE = 0x0000;
public static final int CREATE_FLAG_NONE = 0x0000;
/*
* Context creation flag which specifies a context optimized for low
* latency over peak performance. This is a hint and may have no effect
* on some implementations.
*/
public static final long CREATE_FLAG_LOW_LATENCY = 0x0002;
public static final int CREATE_FLAG_LOW_LATENCY = 0x0002;
/*
* Context creation flag which specifies a context optimized for long
* battery life over peak performance. This is a hint and may have no effect
* on some implementations.
*/
public static final long CREATE_FLAG_LOW_POWER = 0x0004;
public static final int CREATE_FLAG_LOW_POWER = 0x0004;
/*
* Detect the bitness of the VM to allow FieldPacker to do the right thing.
@ -1181,7 +1181,7 @@ public class RenderScript {
* @param ctx The context.
* @return RenderScript
*/
public static RenderScript create(Context ctx, int sdkVersion, ContextType ct, long flags) {
public static RenderScript create(Context ctx, int sdkVersion, ContextType ct, int flags) {
if (!sInitialized) {
Log.e(LOG_TAG, "RenderScript.create() called when disabled; someone is likely to crash");
return null;
@ -1194,7 +1194,7 @@ public class RenderScript {
RenderScript rs = new RenderScript(ctx);
rs.mDev = rs.nDeviceCreate();
rs.mContext = rs.nContextCreate(rs.mDev, (int)flags, sdkVersion, ct.mID);
rs.mContext = rs.nContextCreate(rs.mDev, flags, sdkVersion, ct.mID);
rs.mContextType = ct;
if (rs.mContext == 0) {
throw new RSDriverException("Failed to create RS context.");
@ -1236,7 +1236,7 @@ public class RenderScript {
* @param flags The OR of the CREATE_FLAG_* options desired
* @return RenderScript
*/
public static RenderScript create(Context ctx, ContextType ct, long flags) {
public static RenderScript create(Context ctx, ContextType ct, int flags) {
int v = ctx.getApplicationInfo().targetSdkVersion;
return create(ctx, v, ct, flags);
}