diff options
155 files changed, 5248 insertions, 3285 deletions
diff --git a/api/current.txt b/api/current.txt index 42a96a7..789c321 100644 --- a/api/current.txt +++ b/api/current.txt @@ -22532,6 +22532,9 @@ package android.renderscript { } public class Type extends android.renderscript.BaseObj { + method public static android.renderscript.Type createX(android.renderscript.RenderScript, android.renderscript.Element, int); + method public static android.renderscript.Type createXY(android.renderscript.RenderScript, android.renderscript.Element, int, int); + method public static android.renderscript.Type createXYZ(android.renderscript.RenderScript, android.renderscript.Element, int, int, int); method public int getCount(); method public android.renderscript.Element getElement(); method public int getX(); diff --git a/core/java/android/animation/PropertyValuesHolder.java b/core/java/android/animation/PropertyValuesHolder.java index 43014ad..21f6eda 100644 --- a/core/java/android/animation/PropertyValuesHolder.java +++ b/core/java/android/animation/PropertyValuesHolder.java @@ -743,9 +743,9 @@ public class PropertyValuesHolder implements Cloneable { static class IntPropertyValuesHolder extends PropertyValuesHolder { // Cache JNI functions to avoid looking them up twice - private static final HashMap<Class, HashMap<String, Integer>> sJNISetterPropertyMap = - new HashMap<Class, HashMap<String, Integer>>(); - int mJniSetter; + private static final HashMap<Class, HashMap<String, Long>> sJNISetterPropertyMap = + new HashMap<Class, HashMap<String, Long>>(); + long mJniSetter; private IntProperty mIntProperty; IntKeyframeSet mIntKeyframeSet; @@ -845,11 +845,11 @@ public class PropertyValuesHolder implements Cloneable { // Check new static hashmap<propName, int> for setter method try { mPropertyMapLock.writeLock().lock(); - HashMap<String, Integer> propertyMap = sJNISetterPropertyMap.get(targetClass); + HashMap<String, Long> propertyMap = sJNISetterPropertyMap.get(targetClass); if (propertyMap != null) { - Integer mJniSetterInteger = propertyMap.get(mPropertyName); - if (mJniSetterInteger != null) { - mJniSetter = mJniSetterInteger; + Long jniSetter = propertyMap.get(mPropertyName); + if (jniSetter != null) { + mJniSetter = jniSetter; } } if (mJniSetter == 0) { @@ -857,7 +857,7 @@ public class PropertyValuesHolder implements Cloneable { mJniSetter = nGetIntMethod(targetClass, methodName); if (mJniSetter != 0) { if (propertyMap == null) { - propertyMap = new HashMap<String, Integer>(); + propertyMap = new HashMap<String, Long>(); sJNISetterPropertyMap.put(targetClass, propertyMap); } propertyMap.put(mPropertyName, mJniSetter); @@ -880,9 +880,9 @@ public class PropertyValuesHolder implements Cloneable { static class FloatPropertyValuesHolder extends PropertyValuesHolder { // Cache JNI functions to avoid looking them up twice - private static final HashMap<Class, HashMap<String, Integer>> sJNISetterPropertyMap = - new HashMap<Class, HashMap<String, Integer>>(); - int mJniSetter; + private static final HashMap<Class, HashMap<String, Long>> sJNISetterPropertyMap = + new HashMap<Class, HashMap<String, Long>>(); + long mJniSetter; private FloatProperty mFloatProperty; FloatKeyframeSet mFloatKeyframeSet; @@ -982,11 +982,11 @@ public class PropertyValuesHolder implements Cloneable { // Check new static hashmap<propName, int> for setter method try { mPropertyMapLock.writeLock().lock(); - HashMap<String, Integer> propertyMap = sJNISetterPropertyMap.get(targetClass); + HashMap<String, Long> propertyMap = sJNISetterPropertyMap.get(targetClass); if (propertyMap != null) { - Integer mJniSetterInteger = propertyMap.get(mPropertyName); - if (mJniSetterInteger != null) { - mJniSetter = mJniSetterInteger; + Long jniSetter = propertyMap.get(mPropertyName); + if (jniSetter != null) { + mJniSetter = jniSetter; } } if (mJniSetter == 0) { @@ -994,7 +994,7 @@ public class PropertyValuesHolder implements Cloneable { mJniSetter = nGetFloatMethod(targetClass, methodName); if (mJniSetter != 0) { if (propertyMap == null) { - propertyMap = new HashMap<String, Integer>(); + propertyMap = new HashMap<String, Long>(); sJNISetterPropertyMap.put(targetClass, propertyMap); } propertyMap.put(mPropertyName, mJniSetter); @@ -1015,8 +1015,8 @@ public class PropertyValuesHolder implements Cloneable { } - native static private int nGetIntMethod(Class targetClass, String methodName); - native static private int nGetFloatMethod(Class targetClass, String methodName); - native static private void nCallIntMethod(Object target, int methodID, int arg); - native static private void nCallFloatMethod(Object target, int methodID, float arg); -}
\ No newline at end of file + native static private long nGetIntMethod(Class targetClass, String methodName); + native static private long nGetFloatMethod(Class targetClass, String methodName); + native static private void nCallIntMethod(Object target, long methodID, int arg); + native static private void nCallFloatMethod(Object target, long methodID, float arg); +} diff --git a/core/java/android/app/ActivityThread.java b/core/java/android/app/ActivityThread.java index 9f21a36..4b86b0c 100644 --- a/core/java/android/app/ActivityThread.java +++ b/core/java/android/app/ActivityThread.java @@ -1541,11 +1541,11 @@ public final class ActivityThread { /** * Creates the top level resources for the given package. */ - Resources getTopLevelResources(String resDir, + Resources getTopLevelResources(String resDir, String[] overlayDirs, int displayId, Configuration overrideConfiguration, LoadedApk pkgInfo) { - return mResourcesManager.getTopLevelResources(resDir, displayId, overrideConfiguration, - pkgInfo.getCompatibilityInfo(), null); + return mResourcesManager.getTopLevelResources(resDir, overlayDirs, displayId, + overrideConfiguration, pkgInfo.getCompatibilityInfo(), null); } final Handler getHandler() { diff --git a/core/java/android/app/ApplicationPackageManager.java b/core/java/android/app/ApplicationPackageManager.java index b505d4f..a280448 100644 --- a/core/java/android/app/ApplicationPackageManager.java +++ b/core/java/android/app/ApplicationPackageManager.java @@ -774,7 +774,7 @@ final class ApplicationPackageManager extends PackageManager { } Resources r = mContext.mMainThread.getTopLevelResources( app.uid == Process.myUid() ? app.sourceDir : app.publicSourceDir, - Display.DEFAULT_DISPLAY, null, mContext.mPackageInfo); + app.resourceDirs, Display.DEFAULT_DISPLAY, null, mContext.mPackageInfo); if (r != null) { return r; } diff --git a/core/java/android/app/ContextImpl.java b/core/java/android/app/ContextImpl.java index 190ddb4..8d127c6 100644 --- a/core/java/android/app/ContextImpl.java +++ b/core/java/android/app/ContextImpl.java @@ -1911,8 +1911,8 @@ class ContextImpl extends Context { ContextImpl c = new ContextImpl(); c.init(mPackageInfo, null, mMainThread); c.mResources = mResourcesManager.getTopLevelResources(mPackageInfo.getResDir(), - getDisplayId(), overrideConfiguration, mResources.getCompatibilityInfo(), - mActivityToken); + mPackageInfo.getOverlayDirs(), getDisplayId(), overrideConfiguration, + mResources.getCompatibilityInfo(), mActivityToken); return c; } @@ -1929,7 +1929,7 @@ class ContextImpl extends Context { context.mDisplay = display; DisplayAdjustments daj = getDisplayAdjustments(displayId); context.mResources = mResourcesManager.getTopLevelResources(mPackageInfo.getResDir(), - displayId, null, daj.getCompatibilityInfo(), null); + mPackageInfo.getOverlayDirs(), displayId, null, daj.getCompatibilityInfo(), null); return context; } @@ -2041,7 +2041,8 @@ class ContextImpl extends Context { mDisplayAdjustments.setCompatibilityInfo(compatInfo); mDisplayAdjustments.setActivityToken(activityToken); mResources = mResourcesManager.getTopLevelResources(mPackageInfo.getResDir(), - Display.DEFAULT_DISPLAY, null, compatInfo, activityToken); + mPackageInfo.getOverlayDirs(), Display.DEFAULT_DISPLAY, null, compatInfo, + activityToken); } else { mDisplayAdjustments.setCompatibilityInfo(packageInfo.getCompatibilityInfo()); mDisplayAdjustments.setActivityToken(activityToken); diff --git a/core/java/android/app/LoadedApk.java b/core/java/android/app/LoadedApk.java index 4239a5d..0115d1b 100644 --- a/core/java/android/app/LoadedApk.java +++ b/core/java/android/app/LoadedApk.java @@ -76,6 +76,7 @@ public final class LoadedApk { final String mPackageName; private final String mAppDir; private final String mResDir; + private final String[] mOverlayDirs; private final String[] mSharedLibraries; private final String mDataDir; private final String mLibDir; @@ -120,6 +121,7 @@ public final class LoadedApk { final int myUid = Process.myUid(); mResDir = aInfo.uid == myUid ? aInfo.sourceDir : aInfo.publicSourceDir; + mOverlayDirs = aInfo.resourceDirs; if (!UserHandle.isSameUser(aInfo.uid, myUid) && !Process.isIsolated()) { aInfo.dataDir = PackageManager.getDataDirForUser(UserHandle.getUserId(myUid), mPackageName); @@ -159,6 +161,7 @@ public final class LoadedApk { mPackageName = name; mAppDir = null; mResDir = null; + mOverlayDirs = null; mSharedLibraries = null; mDataDir = null; mDataDirFile = null; @@ -471,6 +474,10 @@ public final class LoadedApk { return mResDir; } + public String[] getOverlayDirs() { + return mOverlayDirs; + } + public String getDataDir() { return mDataDir; } @@ -485,7 +492,7 @@ public final class LoadedApk { public Resources getResources(ActivityThread mainThread) { if (mResources == null) { - mResources = mainThread.getTopLevelResources(mResDir, + mResources = mainThread.getTopLevelResources(mResDir, mOverlayDirs, Display.DEFAULT_DISPLAY, null, this); } return mResources; diff --git a/core/java/android/app/ResourcesManager.java b/core/java/android/app/ResourcesManager.java index f55dba4..728f372 100644 --- a/core/java/android/app/ResourcesManager.java +++ b/core/java/android/app/ResourcesManager.java @@ -147,7 +147,7 @@ public class ResourcesManager { * @param compatInfo the compability info. Must not be null. * @param token the application token for determining stack bounds. */ - public Resources getTopLevelResources(String resDir, int displayId, + public Resources getTopLevelResources(String resDir, String[] overlayDirs, int displayId, Configuration overrideConfiguration, CompatibilityInfo compatInfo, IBinder token) { final float scale = compatInfo.applicationScale; ResourcesKey key = new ResourcesKey(resDir, displayId, overrideConfiguration, scale, @@ -180,6 +180,12 @@ public class ResourcesManager { return null; } + if (overlayDirs != null) { + for (String idmapPath : overlayDirs) { + assets.addOverlayPath(idmapPath); + } + } + //Slog.i(TAG, "Resource: key=" + key + ", display metrics=" + metrics); DisplayMetrics dm = getDisplayMetricsLocked(displayId); Configuration config; diff --git a/core/java/android/content/pm/PackageInfo.java b/core/java/android/content/pm/PackageInfo.java index af1a6d5..785f2b4 100644 --- a/core/java/android/content/pm/PackageInfo.java +++ b/core/java/android/content/pm/PackageInfo.java @@ -227,6 +227,14 @@ public class PackageInfo implements Parcelable { /** @hide */ public String requiredAccountType; + /** + * What package, if any, this package will overlay. + * + * Package name of target package, or null. + * @hide + */ + public String overlayTarget; + public PackageInfo() { } @@ -270,6 +278,7 @@ public class PackageInfo implements Parcelable { dest.writeInt(requiredForAllUsers ? 1 : 0); dest.writeString(restrictedAccountType); dest.writeString(requiredAccountType); + dest.writeString(overlayTarget); } public static final Parcelable.Creator<PackageInfo> CREATOR @@ -311,5 +320,6 @@ public class PackageInfo implements Parcelable { requiredForAllUsers = source.readInt() != 0; restrictedAccountType = source.readString(); requiredAccountType = source.readString(); + overlayTarget = source.readString(); } } diff --git a/core/java/android/content/pm/PackageParser.java b/core/java/android/content/pm/PackageParser.java index 4607902..52564eb 100644 --- a/core/java/android/content/pm/PackageParser.java +++ b/core/java/android/content/pm/PackageParser.java @@ -307,6 +307,7 @@ public class PackageParser { } pi.restrictedAccountType = p.mRestrictedAccountType; pi.requiredAccountType = p.mRequiredAccountType; + pi.overlayTarget = p.mOverlayTarget; pi.firstInstallTime = firstInstallTime; pi.lastUpdateTime = lastUpdateTime; if ((flags&PackageManager.GET_GIDS) != 0) { @@ -490,6 +491,11 @@ public class PackageParser { public Package parsePackage(File sourceFile, String destCodePath, DisplayMetrics metrics, int flags) { + return parsePackage(sourceFile, destCodePath, metrics, flags, false); + } + + public Package parsePackage(File sourceFile, String destCodePath, + DisplayMetrics metrics, int flags, boolean trustedOverlay) { mParseError = PackageManager.INSTALL_SUCCEEDED; mArchiveSourcePath = sourceFile.getPath(); @@ -542,7 +548,7 @@ public class PackageParser { Exception errorException = null; try { // XXXX todo: need to figure out correct configuration. - pkg = parsePackage(res, parser, flags, errorText); + pkg = parsePackage(res, parser, flags, trustedOverlay, errorText); } catch (Exception e) { errorException = e; mParseError = PackageManager.INSTALL_PARSE_FAILED_UNEXPECTED_EXCEPTION; @@ -951,8 +957,8 @@ public class PackageParser { } private Package parsePackage( - Resources res, XmlResourceParser parser, int flags, String[] outError) - throws XmlPullParserException, IOException { + Resources res, XmlResourceParser parser, int flags, boolean trustedOverlay, + String[] outError) throws XmlPullParserException, IOException { AttributeSet attrs = parser; mParseInstrumentationArgs = null; @@ -1051,6 +1057,31 @@ public class PackageParser { if (!parseApplication(pkg, res, parser, attrs, flags, outError)) { return null; } + } else if (tagName.equals("overlay")) { + pkg.mTrustedOverlay = trustedOverlay; + + sa = res.obtainAttributes(attrs, + com.android.internal.R.styleable.AndroidManifestResourceOverlay); + pkg.mOverlayTarget = sa.getString( + com.android.internal.R.styleable.AndroidManifestResourceOverlay_targetPackage); + pkg.mOverlayPriority = sa.getInt( + com.android.internal.R.styleable.AndroidManifestResourceOverlay_priority, + -1); + sa.recycle(); + + if (pkg.mOverlayTarget == null) { + outError[0] = "<overlay> does not specify a target package"; + mParseError = PackageManager.INSTALL_PARSE_FAILED_MANIFEST_MALFORMED; + return null; + } + if (pkg.mOverlayPriority < 0 || pkg.mOverlayPriority > 9999) { + outError[0] = "<overlay> priority must be between 0 and 9999"; + mParseError = + PackageManager.INSTALL_PARSE_FAILED_MANIFEST_MALFORMED; + return null; + } + XmlUtils.skipCurrentTag(parser); + } else if (tagName.equals("keys")) { if (!parseKeys(pkg, res, parser, attrs, outError)) { return null; @@ -3546,6 +3577,10 @@ public class PackageParser { */ public ManifestDigest manifestDigest; + public String mOverlayTarget; + public int mOverlayPriority; + public boolean mTrustedOverlay; + /** * Data used to feed the KeySetManager */ diff --git a/core/java/android/content/res/AssetManager.java b/core/java/android/content/res/AssetManager.java index 93ce633..418bdda 100644 --- a/core/java/android/content/res/AssetManager.java +++ b/core/java/android/content/res/AssetManager.java @@ -69,13 +69,13 @@ public final class AssetManager { private final long[] mOffsets = new long[2]; // For communication with native code. - private int mObject; + private long mObject; private StringBlock mStringBlocks[] = null; private int mNumRefs = 1; private boolean mOpen = true; - private HashMap<Integer, RuntimeException> mRefStacks; + private HashMap<Long, RuntimeException> mRefStacks; /** * Create a new AssetManager containing only the basic system assets. @@ -90,7 +90,7 @@ public final class AssetManager { mNumRefs = 0; incRefsLocked(this.hashCode()); } - init(); + init(false); if (localLOGV) Log.v(TAG, "New asset manager: " + this); ensureSystemAssets(); } @@ -113,7 +113,7 @@ public final class AssetManager { incRefsLocked(this.hashCode()); } } - init(); + init(true); if (localLOGV) Log.v(TAG, "New asset manager: " + this); } @@ -224,7 +224,7 @@ public final class AssetManager { return retArray; } - /*package*/ final boolean getThemeValue(int theme, int ident, + /*package*/ final boolean getThemeValue(long theme, int ident, TypedValue outValue, boolean resolveRefs) { int block = loadThemeAttributeValue(theme, ident, outValue, resolveRefs); if (block >= 0) { @@ -312,7 +312,7 @@ public final class AssetManager { if (!mOpen) { throw new RuntimeException("Assetmanager has been closed"); } - int asset = openAsset(fileName, accessMode); + long asset = openAsset(fileName, accessMode); if (asset != 0) { AssetInputStream res = new AssetInputStream(asset); incRefsLocked(res.hashCode()); @@ -404,7 +404,7 @@ public final class AssetManager { if (!mOpen) { throw new RuntimeException("Assetmanager has been closed"); } - int asset = openNonAssetNative(cookie, fileName, accessMode); + long asset = openNonAssetNative(cookie, fileName, accessMode); if (asset != 0) { AssetInputStream res = new AssetInputStream(asset); incRefsLocked(res.hashCode()); @@ -484,7 +484,7 @@ public final class AssetManager { if (!mOpen) { throw new RuntimeException("Assetmanager has been closed"); } - int xmlBlock = openXmlAssetNative(cookie, fileName); + long xmlBlock = openXmlAssetNative(cookie, fileName); if (xmlBlock != 0) { XmlBlock res = new XmlBlock(this, xmlBlock); incRefsLocked(res.hashCode()); @@ -500,18 +500,18 @@ public final class AssetManager { } } - /*package*/ final int createTheme() { + /*package*/ final long createTheme() { synchronized (this) { if (!mOpen) { throw new RuntimeException("Assetmanager has been closed"); } - int res = newTheme(); + long res = newTheme(); incRefsLocked(res); return res; } } - /*package*/ final void releaseTheme(int theme) { + /*package*/ final void releaseTheme(long theme) { synchronized (this) { deleteTheme(theme); decRefsLocked(theme); @@ -537,7 +537,7 @@ public final class AssetManager { public final class AssetInputStream extends InputStream { public final int getAssetInt() { - return mAsset; + return (int) mAsset; } /** * @hide @@ -545,7 +545,7 @@ public final class AssetManager { public final long getNativeAsset() { return mAsset; } - private AssetInputStream(int asset) + private AssetInputStream(long asset) { mAsset = asset; mLength = getAssetLength(asset); @@ -597,7 +597,7 @@ public final class AssetManager { close(); } - private int mAsset; + private long mAsset; private long mLength; private long mMarkPos; } @@ -615,6 +615,16 @@ public final class AssetManager { private native final int addAssetPathNative(String path); + /** + * Add a set of assets to overlay an already added set of assets. + * + * This is only intended for application resources. System wide resources + * are handled before any Java code is executed. + * + * {@hide} + */ + public native final int addOverlayPath(String idmapPath); + /** * Add multiple sets of assets to the asset manager at once. See * {@link #addAssetPath(String)} for more information. Returns array of @@ -678,19 +688,19 @@ public final class AssetManager { /*package*/ native final String getResourceTypeName(int resid); /*package*/ native final String getResourceEntryName(int resid); - private native final int openAsset(String fileName, int accessMode); + private native final long openAsset(String fileName, int accessMode); private final native ParcelFileDescriptor openAssetFd(String fileName, long[] outOffsets) throws IOException; - private native final int openNonAssetNative(int cookie, String fileName, + private native final long openNonAssetNative(int cookie, String fileName, int accessMode); private native ParcelFileDescriptor openNonAssetFdNative(int cookie, String fileName, long[] outOffsets) throws IOException; - private native final void destroyAsset(int asset); - private native final int readAssetChar(int asset); - private native final int readAsset(int asset, byte[] b, int off, int len); - private native final long seekAsset(int asset, long offset, int whence); - private native final long getAssetLength(int asset); - private native final long getAssetRemainingLength(int asset); + private native final void destroyAsset(long asset); + private native final int readAssetChar(long asset); + private native final int readAsset(long asset, byte[] b, int off, int len); + private native final long seekAsset(long asset, long offset, int whence); + private native final long getAssetLength(long asset); + private native final long getAssetRemainingLength(long asset); /** Returns true if the resource was found, filling in mRetStringBlock and * mRetData. */ @@ -707,15 +717,15 @@ public final class AssetManager { /*package*/ static final int STYLE_RESOURCE_ID = 3; /*package*/ static final int STYLE_CHANGING_CONFIGURATIONS = 4; /*package*/ static final int STYLE_DENSITY = 5; - /*package*/ native static final boolean applyStyle(int theme, - int defStyleAttr, int defStyleRes, int xmlParser, + /*package*/ native static final boolean applyStyle(long theme, + int defStyleAttr, int defStyleRes, long xmlParser, int[] inAttrs, int[] outValues, int[] outIndices); /*package*/ native final boolean retrieveAttributes( - int xmlParser, int[] inAttrs, int[] outValues, int[] outIndices); + long xmlParser, int[] inAttrs, int[] outValues, int[] outIndices); /*package*/ native final int getArraySize(int resource); /*package*/ native final int retrieveArray(int resource, int[] outValues); private native final int getStringBlockCount(); - private native final int getNativeStringBlock(int block); + private native final long getNativeStringBlock(int block); /** * {@hide} @@ -737,37 +747,37 @@ public final class AssetManager { */ public native static final int getGlobalAssetManagerCount(); - private native final int newTheme(); - private native final void deleteTheme(int theme); - /*package*/ native static final void applyThemeStyle(int theme, int styleRes, boolean force); - /*package*/ native static final void copyTheme(int dest, int source); - /*package*/ native static final int loadThemeAttributeValue(int theme, int ident, + private native final long newTheme(); + private native final void deleteTheme(long theme); + /*package*/ native static final void applyThemeStyle(long theme, int styleRes, boolean force); + /*package*/ native static final void copyTheme(long dest, long source); + /*package*/ native static final int loadThemeAttributeValue(long theme, int ident, TypedValue outValue, boolean resolve); - /*package*/ native static final void dumpTheme(int theme, int priority, String tag, String prefix); + /*package*/ native static final void dumpTheme(long theme, int priority, String tag, String prefix); - private native final int openXmlAssetNative(int cookie, String fileName); + private native final long openXmlAssetNative(int cookie, String fileName); private native final String[] getArrayStringResource(int arrayRes); private native final int[] getArrayStringInfo(int arrayRes); /*package*/ native final int[] getArrayIntResource(int arrayRes); - private native final void init(); + private native final void init(boolean isSystem); private native final void destroy(); - private final void incRefsLocked(int id) { + private final void incRefsLocked(long id) { if (DEBUG_REFS) { if (mRefStacks == null) { - mRefStacks = new HashMap<Integer, RuntimeException>(); - RuntimeException ex = new RuntimeException(); - ex.fillInStackTrace(); - mRefStacks.put(this.hashCode(), ex); + mRefStacks = new HashMap<Long, RuntimeException>(); } + RuntimeException ex = new RuntimeException(); + ex.fillInStackTrace(); + mRefStacks.put(id, ex); } mNumRefs++; } - private final void decRefsLocked(int id) { + private final void decRefsLocked(long id) { if (DEBUG_REFS && mRefStacks != null) { mRefStacks.remove(id); } diff --git a/core/java/android/content/res/Resources.java b/core/java/android/content/res/Resources.java index cd5b5d2..7fc364f 100644 --- a/core/java/android/content/res/Resources.java +++ b/core/java/android/content/res/Resources.java @@ -1460,7 +1460,7 @@ public class Resources { } private final AssetManager mAssets; - private final int mTheme; + private final long mTheme; } /** diff --git a/core/java/android/content/res/StringBlock.java b/core/java/android/content/res/StringBlock.java index 78180b1..77b8a33 100644 --- a/core/java/android/content/res/StringBlock.java +++ b/core/java/android/content/res/StringBlock.java @@ -36,7 +36,7 @@ final class StringBlock { private static final String TAG = "AssetManager"; private static final boolean localLOGV = false; - private final int mNative; + private final long mNative; private final boolean mUseSparse; private final boolean mOwnsNative; private CharSequence[] mStrings; @@ -474,7 +474,7 @@ final class StringBlock { * are doing! The given native object must exist for the entire lifetime * of this newly creating StringBlock. */ - StringBlock(int obj, boolean useSparse) { + StringBlock(long obj, boolean useSparse) { mNative = obj; mUseSparse = useSparse; mOwnsNative = false; @@ -482,11 +482,11 @@ final class StringBlock { + ": " + nativeGetSize(mNative)); } - private static native int nativeCreate(byte[] data, + private static native long nativeCreate(byte[] data, int offset, int size); - private static native int nativeGetSize(int obj); - private static native String nativeGetString(int obj, int idx); - private static native int[] nativeGetStyle(int obj, int idx); - private static native void nativeDestroy(int obj); + private static native int nativeGetSize(long obj); + private static native String nativeGetString(long obj, int idx); + private static native int[] nativeGetStyle(long obj, int idx); + private static native void nativeDestroy(long obj); } diff --git a/core/java/android/content/res/XmlBlock.java b/core/java/android/content/res/XmlBlock.java index bea6529..3ad357f 100644 --- a/core/java/android/content/res/XmlBlock.java +++ b/core/java/android/content/res/XmlBlock.java @@ -75,7 +75,7 @@ final class XmlBlock { } /*package*/ final class Parser implements XmlResourceParser { - Parser(int parseState, XmlBlock block) { + Parser(long parseState, XmlBlock block) { mParseState = parseState; mBlock = block; block.mOpenCount++; @@ -458,7 +458,7 @@ final class XmlBlock { return mStrings.get(id); } - /*package*/ int mParseState; + /*package*/ long mParseState; private final XmlBlock mBlock; private boolean mStarted = false; private boolean mDecNextDepth = false; @@ -476,41 +476,41 @@ final class XmlBlock { * are doing! The given native object must exist for the entire lifetime * of this newly creating XmlBlock. */ - XmlBlock(AssetManager assets, int xmlBlock) { + XmlBlock(AssetManager assets, long xmlBlock) { mAssets = assets; mNative = xmlBlock; mStrings = new StringBlock(nativeGetStringBlock(xmlBlock), false); } private final AssetManager mAssets; - private final int mNative; + private final long mNative; /*package*/ final StringBlock mStrings; private boolean mOpen = true; private int mOpenCount = 1; - private static final native int nativeCreate(byte[] data, + private static final native long nativeCreate(byte[] data, int offset, int size); - private static final native int nativeGetStringBlock(int obj); + private static final native long nativeGetStringBlock(long obj); - private static final native int nativeCreateParseState(int obj); - /*package*/ static final native int nativeNext(int state); - private static final native int nativeGetNamespace(int state); - /*package*/ static final native int nativeGetName(int state); - private static final native int nativeGetText(int state); - private static final native int nativeGetLineNumber(int state); - private static final native int nativeGetAttributeCount(int state); - private static final native int nativeGetAttributeNamespace(int state, int idx); - private static final native int nativeGetAttributeName(int state, int idx); - private static final native int nativeGetAttributeResource(int state, int idx); - private static final native int nativeGetAttributeDataType(int state, int idx); - private static final native int nativeGetAttributeData(int state, int idx); - private static final native int nativeGetAttributeStringValue(int state, int idx); - private static final native int nativeGetIdAttribute(int state); - private static final native int nativeGetClassAttribute(int state); - private static final native int nativeGetStyleAttribute(int state); - private static final native int nativeGetAttributeIndex(int state, String namespace, String name); - private static final native void nativeDestroyParseState(int state); + private static final native long nativeCreateParseState(long obj); + /*package*/ static final native int nativeNext(long state); + private static final native int nativeGetNamespace(long state); + /*package*/ static final native int nativeGetName(long state); + private static final native int nativeGetText(long state); + private static final native int nativeGetLineNumber(long state); + private static final native int nativeGetAttributeCount(long state); + private static final native int nativeGetAttributeNamespace(long state, int idx); + private static final native int nativeGetAttributeName(long state, int idx); + private static final native int nativeGetAttributeResource(long state, int idx); + private static final native int nativeGetAttributeDataType(long state, int idx); + private static final native int nativeGetAttributeData(long state, int idx); + private static final native int nativeGetAttributeStringValue(long state, int idx); + private static final native int nativeGetIdAttribute(long state); + private static final native int nativeGetClassAttribute(long state); + private static final native int nativeGetStyleAttribute(long state); + private static final native int nativeGetAttributeIndex(long state, String namespace, String name); + private static final native void nativeDestroyParseState(long state); - private static final native void nativeDestroy(int obj); + private static final native void nativeDestroy(long obj); } diff --git a/core/java/android/emoji/EmojiFactory.java b/core/java/android/emoji/EmojiFactory.java index 8fd8695..aba990d 100644 --- a/core/java/android/emoji/EmojiFactory.java +++ b/core/java/android/emoji/EmojiFactory.java @@ -54,7 +54,7 @@ public final class EmojiFactory { } // A pointer to native EmojiFactory object. - private int mNativeEmojiFactory; + private long mNativeEmojiFactory; private String mName; // Cache. private Map<Integer, WeakReference<Bitmap>> mCache; @@ -68,7 +68,7 @@ public final class EmojiFactory { * * This can be called from JNI code. */ - private EmojiFactory(int nativeEmojiFactory, String name) { + private EmojiFactory(long nativeEmojiFactory, String name) { mNativeEmojiFactory = nativeEmojiFactory; mName = name; mCache = new CustomLinkedHashMap<Integer, WeakReference<Bitmap>>(); @@ -272,18 +272,18 @@ public final class EmojiFactory { // native methods - private native void nativeDestructor(int factory); - private native Bitmap nativeGetBitmapFromAndroidPua(int nativeEmojiFactory, int AndroidPua); - private native int nativeGetAndroidPuaFromVendorSpecificSjis(int nativeEmojiFactory, + private native void nativeDestructor(long nativeEmojiFactory); + private native Bitmap nativeGetBitmapFromAndroidPua(long nativeEmojiFactory, int AndroidPua); + private native int nativeGetAndroidPuaFromVendorSpecificSjis(long nativeEmojiFactory, char sjis); - private native int nativeGetVendorSpecificSjisFromAndroidPua(int nativeEmojiFactory, + private native int nativeGetVendorSpecificSjisFromAndroidPua(long nativeEmojiFactory, int pua); - private native int nativeGetAndroidPuaFromVendorSpecificPua(int nativeEmojiFactory, + private native int nativeGetAndroidPuaFromVendorSpecificPua(long nativeEmojiFactory, int vsp); - private native int nativeGetVendorSpecificPuaFromAndroidPua(int nativeEmojiFactory, + private native int nativeGetVendorSpecificPuaFromAndroidPua(long nativeEmojiFactory, int pua); - private native int nativeGetMaximumVendorSpecificPua(int nativeEmojiFactory); - private native int nativeGetMinimumVendorSpecificPua(int nativeEmojiFactory); - private native int nativeGetMaximumAndroidPua(int nativeEmojiFactory); - private native int nativeGetMinimumAndroidPua(int nativeEmojiFactory); + private native int nativeGetMaximumVendorSpecificPua(long nativeEmojiFactory); + private native int nativeGetMinimumVendorSpecificPua(long nativeEmojiFactory); + private native int nativeGetMaximumAndroidPua(long nativeEmojiFactory); + private native int nativeGetMinimumAndroidPua(long nativeEmojiFactory); } diff --git a/core/java/android/os/CountDownTimer.java b/core/java/android/os/CountDownTimer.java index 15e6405..58acbcf 100644 --- a/core/java/android/os/CountDownTimer.java +++ b/core/java/android/os/CountDownTimer.java @@ -16,8 +16,6 @@ package android.os; -import android.util.Log; - /** * Schedule a countdown until a time in the future, with * regular notifications on intervals along the way. @@ -56,6 +54,11 @@ public abstract class CountDownTimer { private final long mCountdownInterval; private long mStopTimeInFuture; + + /** + * boolean representing if the timer was cancelled + */ + private boolean mCancelled = false; /** * @param millisInFuture The number of millis in the future from the call @@ -72,7 +75,8 @@ public abstract class CountDownTimer { /** * Cancel the countdown. */ - public final void cancel() { + public synchronized final void cancel() { + mCancelled = true; mHandler.removeMessages(MSG); } @@ -80,6 +84,7 @@ public abstract class CountDownTimer { * Start the countdown. */ public synchronized final CountDownTimer start() { + mCancelled = false; if (mMillisInFuture <= 0) { onFinish(); return this; @@ -112,6 +117,10 @@ public abstract class CountDownTimer { public void handleMessage(Message msg) { synchronized (CountDownTimer.this) { + if (mCancelled) { + return; + } + final long millisLeft = mStopTimeInFuture - SystemClock.elapsedRealtime(); if (millisLeft <= 0) { diff --git a/core/java/android/os/Parcel.java b/core/java/android/os/Parcel.java index 6716098..3470790 100644 --- a/core/java/android/os/Parcel.java +++ b/core/java/android/os/Parcel.java @@ -1246,9 +1246,6 @@ public final class Parcel { } else if (v instanceof Parcelable[]) { writeInt(VAL_PARCELABLEARRAY); writeParcelableArray((Parcelable[]) v, 0); - } else if (v instanceof Object[]) { - writeInt(VAL_OBJECTARRAY); - writeArray((Object[]) v); } else if (v instanceof int[]) { writeInt(VAL_INTARRAY); writeIntArray((int[]) v); @@ -1258,12 +1255,20 @@ public final class Parcel { } else if (v instanceof Byte) { writeInt(VAL_BYTE); writeInt((Byte) v); - } else if (v instanceof Serializable) { - // Must be last - writeInt(VAL_SERIALIZABLE); - writeSerializable((Serializable) v); } else { - throw new RuntimeException("Parcel: unable to marshal value " + v); + Class<?> clazz = v.getClass(); + if (clazz.isArray() && clazz.getComponentType() == Object.class) { + // Only pure Object[] are written here, Other arrays of non-primitive types are + // handled by serialization as this does not record the component type. + writeInt(VAL_OBJECTARRAY); + writeArray((Object[]) v); + } else if (v instanceof Serializable) { + // Must be last + writeInt(VAL_SERIALIZABLE); + writeSerializable((Serializable) v); + } else { + throw new RuntimeException("Parcel: unable to marshal value " + v); + } } } diff --git a/core/java/com/android/internal/app/ProcessStats.java b/core/java/com/android/internal/app/ProcessStats.java index 0cad33c..a87992a 100644 --- a/core/java/com/android/internal/app/ProcessStats.java +++ b/core/java/com/android/internal/app/ProcessStats.java @@ -1046,7 +1046,7 @@ public final class ProcessStats implements Parcelable { public boolean evaluateSystemProperties(boolean update) { boolean changed = false; - String runtime = SystemProperties.get("persist.sys.dalvik.vm.lib", + String runtime = SystemProperties.get("persist.sys.dalvik.vm.lib.1", VMRuntime.getRuntime().vmLibrary()); if (!Objects.equals(runtime, mRuntime)) { changed = true; diff --git a/core/jni/android/graphics/pdf/PdfDocument.cpp b/core/jni/android/graphics/pdf/PdfDocument.cpp index 6175a8f..d54aaa8 100644 --- a/core/jni/android/graphics/pdf/PdfDocument.cpp +++ b/core/jni/android/graphics/pdf/PdfDocument.cpp @@ -113,24 +113,24 @@ private: PageRecord* mCurrentPage; }; -static jint nativeCreateDocument(JNIEnv* env, jobject thiz) { - return reinterpret_cast<jint>(new PdfDocument()); +static jlong nativeCreateDocument(JNIEnv* env, jobject thiz) { + return reinterpret_cast<jlong>(new PdfDocument()); } -static jint nativeStartPage(JNIEnv* env, jobject thiz, jint documentPtr, +static jlong nativeStartPage(JNIEnv* env, jobject thiz, jlong documentPtr, jint pageWidth, jint pageHeight, jint contentLeft, jint contentTop, jint contentRight, jint contentBottom) { PdfDocument* document = reinterpret_cast<PdfDocument*>(documentPtr); - return reinterpret_cast<jint>(document->startPage(pageWidth, pageHeight, + return reinterpret_cast<jlong>(document->startPage(pageWidth, pageHeight, contentLeft, contentTop, contentRight, contentBottom)); } -static void nativeFinishPage(JNIEnv* env, jobject thiz, jint documentPtr) { +static void nativeFinishPage(JNIEnv* env, jobject thiz, jlong documentPtr) { PdfDocument* document = reinterpret_cast<PdfDocument*>(documentPtr); document->finishPage(); } -static void nativeWriteTo(JNIEnv* env, jobject thiz, jint documentPtr, jobject out, +static void nativeWriteTo(JNIEnv* env, jobject thiz, jlong documentPtr, jobject out, jbyteArray chunk) { PdfDocument* document = reinterpret_cast<PdfDocument*>(documentPtr); SkWStream* skWStream = CreateJavaOutputStreamAdaptor(env, out, chunk); @@ -138,17 +138,17 @@ static void nativeWriteTo(JNIEnv* env, jobject thiz, jint documentPtr, jobject o delete skWStream; } -static void nativeClose(JNIEnv* env, jobject thiz, jint documentPtr) { +static void nativeClose(JNIEnv* env, jobject thiz, jlong documentPtr) { PdfDocument* document = reinterpret_cast<PdfDocument*>(documentPtr); document->close(); } static JNINativeMethod gPdfDocument_Methods[] = { - {"nativeCreateDocument", "()I", (void*) nativeCreateDocument}, - {"nativeStartPage", "(IIIIIII)I", (void*) nativeStartPage}, - {"nativeFinishPage", "(I)V", (void*) nativeFinishPage}, - {"nativeWriteTo", "(ILjava/io/OutputStream;[B)V", (void*) nativeWriteTo}, - {"nativeClose", "(I)V", (void*) nativeClose} + {"nativeCreateDocument", "()J", (void*) nativeCreateDocument}, + {"nativeStartPage", "(JIIIIII)J", (void*) nativeStartPage}, + {"nativeFinishPage", "(J)V", (void*) nativeFinishPage}, + {"nativeWriteTo", "(JLjava/io/OutputStream;[B)V", (void*) nativeWriteTo}, + {"nativeClose", "(J)V", (void*) nativeClose} }; int register_android_graphics_pdf_PdfDocument(JNIEnv* env) { diff --git a/core/jni/android_animation_PropertyValuesHolder.cpp b/core/jni/android_animation_PropertyValuesHolder.cpp index 5991805..1e3ec18 100644 --- a/core/jni/android_animation_PropertyValuesHolder.cpp +++ b/core/jni/android_animation_PropertyValuesHolder.cpp @@ -29,44 +29,44 @@ namespace android { const char* const kClassPathName = "android/animation/PropertyValuesHolder"; -static jmethodID android_animation_PropertyValuesHolder_getIntMethod( +static jlong android_animation_PropertyValuesHolder_getIntMethod( JNIEnv* env, jclass pvhClass, jclass targetClass, jstring methodName) { const char *nativeString = env->GetStringUTFChars(methodName, 0); jmethodID mid = env->GetMethodID(targetClass, nativeString, "(I)V"); env->ReleaseStringUTFChars(methodName, nativeString); - return mid; + return reinterpret_cast<jlong>(mid); } -static jmethodID android_animation_PropertyValuesHolder_getFloatMethod( +static jlong android_animation_PropertyValuesHolder_getFloatMethod( JNIEnv* env, jclass pvhClass, jclass targetClass, jstring methodName) { const char *nativeString = env->GetStringUTFChars(methodName, 0); jmethodID mid = env->GetMethodID(targetClass, nativeString, "(F)V"); env->ReleaseStringUTFChars(methodName, nativeString); - return mid; + return reinterpret_cast<jlong>(mid); } static void android_animation_PropertyValuesHolder_callIntMethod( - JNIEnv* env, jclass pvhObject, jobject target, jmethodID methodID, int arg) + JNIEnv* env, jclass pvhObject, jobject target, jlong methodID, jint arg) { - env->CallVoidMethod(target, methodID, arg); + env->CallVoidMethod(target, reinterpret_cast<jmethodID>(methodID), arg); } static void android_animation_PropertyValuesHolder_callFloatMethod( - JNIEnv* env, jclass pvhObject, jobject target, jmethodID methodID, float arg) + JNIEnv* env, jclass pvhObject, jobject target, jlong methodID, jfloat arg) { - env->CallVoidMethod(target, methodID, arg); + env->CallVoidMethod(target, reinterpret_cast<jmethodID>(methodID), arg); } static JNINativeMethod gMethods[] = { - { "nGetIntMethod", "(Ljava/lang/Class;Ljava/lang/String;)I", + { "nGetIntMethod", "(Ljava/lang/Class;Ljava/lang/String;)J", (void*)android_animation_PropertyValuesHolder_getIntMethod }, - { "nGetFloatMethod", "(Ljava/lang/Class;Ljava/lang/String;)I", + { "nGetFloatMethod", "(Ljava/lang/Class;Ljava/lang/String;)J", (void*)android_animation_PropertyValuesHolder_getFloatMethod }, - { "nCallIntMethod", "(Ljava/lang/Object;II)V", + { "nCallIntMethod", "(Ljava/lang/Object;JI)V", (void*)android_animation_PropertyValuesHolder_callIntMethod }, - { "nCallFloatMethod", "(Ljava/lang/Object;IF)V", + { "nCallFloatMethod", "(Ljava/lang/Object;JF)V", (void*)android_animation_PropertyValuesHolder_callFloatMethod } }; diff --git a/core/jni/android_database_SQLiteGlobal.cpp b/core/jni/android_database_SQLiteGlobal.cpp index acc2276..89d64fa 100644 --- a/core/jni/android_database_SQLiteGlobal.cpp +++ b/core/jni/android_database_SQLiteGlobal.cpp @@ -39,7 +39,7 @@ static void sqliteLogCallback(void* data, int iErrCode, const char* zMsg) { bool verboseLog = !!data; if (iErrCode == 0 || iErrCode == SQLITE_CONSTRAINT || iErrCode == SQLITE_SCHEMA) { if (verboseLog) { - ALOGV(LOG_VERBOSE, SQLITE_LOG_TAG, "(%d) %s\n", iErrCode, zMsg); + ALOG(LOG_VERBOSE, SQLITE_LOG_TAG, "(%d) %s\n", iErrCode, zMsg); } } else { ALOG(LOG_ERROR, SQLITE_LOG_TAG, "(%d) %s\n", iErrCode, zMsg); diff --git a/core/jni/android_emoji_EmojiFactory.cpp b/core/jni/android_emoji_EmojiFactory.cpp index 5276934..f127d29 100644 --- a/core/jni/android_emoji_EmojiFactory.cpp +++ b/core/jni/android_emoji_EmojiFactory.cpp @@ -104,7 +104,7 @@ static void InitializeCaller() { static jobject create_java_EmojiFactory( JNIEnv* env, EmojiFactory* factory, jstring name) { jobject obj = env->NewObject(gEmojiFactory_class, gEmojiFactory_constructorMethodID, - static_cast<jint>(reinterpret_cast<uintptr_t>(factory)), name); + reinterpret_cast<jlong>(factory), name); if (env->ExceptionCheck() != 0) { ALOGE("*** Uncaught exception returned from Java call!\n"); env->ExceptionDescribe(); @@ -155,7 +155,7 @@ static jobject android_emoji_EmojiFactory_newAvailableInstance( } static jobject android_emoji_EmojiFactory_getBitmapFromAndroidPua( - JNIEnv* env, jobject clazz, jint nativeEmojiFactory, jint pua) { + JNIEnv* env, jobject clazz, jlong nativeEmojiFactory, jint pua) { EmojiFactory *factory = reinterpret_cast<EmojiFactory *>(nativeEmojiFactory); int size; @@ -175,7 +175,7 @@ static jobject android_emoji_EmojiFactory_getBitmapFromAndroidPua( } static void android_emoji_EmojiFactory_destructor( - JNIEnv* env, jobject obj, jint nativeEmojiFactory) { + JNIEnv* env, jobject obj, jlong nativeEmojiFactory) { /* // Must not delete this object!! EmojiFactory *factory = reinterpret_cast<EmojiFactory *>(nativeEmojiFactory); @@ -184,49 +184,49 @@ static void android_emoji_EmojiFactory_destructor( } static jint android_emoji_EmojiFactory_getAndroidPuaFromVendorSpecificSjis( - JNIEnv* env, jobject obj, jint nativeEmojiFactory, jchar sjis) { + JNIEnv* env, jobject obj, jlong nativeEmojiFactory, jchar sjis) { EmojiFactory *factory = reinterpret_cast<EmojiFactory *>(nativeEmojiFactory); return factory->GetAndroidPuaFromVendorSpecificSjis(sjis); } static jint android_emoji_EmojiFactory_getVendorSpecificSjisFromAndroidPua( - JNIEnv* env, jobject obj, jint nativeEmojiFactory, jint pua) { + JNIEnv* env, jobject obj, jlong nativeEmojiFactory, jint pua) { EmojiFactory *factory = reinterpret_cast<EmojiFactory *>(nativeEmojiFactory); return factory->GetVendorSpecificSjisFromAndroidPua(pua); } static jint android_emoji_EmojiFactory_getAndroidPuaFromVendorSpecificPua( - JNIEnv* env, jobject obj, jint nativeEmojiFactory, jint vsu) { + JNIEnv* env, jobject obj, jlong nativeEmojiFactory, jint vsu) { EmojiFactory *factory = reinterpret_cast<EmojiFactory *>(nativeEmojiFactory); return factory->GetAndroidPuaFromVendorSpecificPua(vsu); } static jint android_emoji_EmojiFactory_getVendorSpecificPuaFromAndroidPua( - JNIEnv* env, jobject obj, jint nativeEmojiFactory, jint pua) { + JNIEnv* env, jobject obj, jlong nativeEmojiFactory, jint pua) { EmojiFactory *factory = reinterpret_cast<EmojiFactory *>(nativeEmojiFactory); return factory->GetVendorSpecificPuaFromAndroidPua(pua); } static jint android_emoji_EmojiFactory_getMaximumVendorSpecificPua( - JNIEnv* env, jobject obj, jint nativeEmojiFactory) { + JNIEnv* env, jobject obj, jlong nativeEmojiFactory) { EmojiFactory *factory = reinterpret_cast<EmojiFactory *>(nativeEmojiFactory); return factory->GetMaximumVendorSpecificPua(); } static jint android_emoji_EmojiFactory_getMinimumVendorSpecificPua( - JNIEnv* env, jobject obj, jint nativeEmojiFactory) { + JNIEnv* env, jobject obj, jlong nativeEmojiFactory) { EmojiFactory *factory = reinterpret_cast<EmojiFactory *>(nativeEmojiFactory); return factory->GetMinimumVendorSpecificPua(); } static jint android_emoji_EmojiFactory_getMaximumAndroidPua( - JNIEnv* env, jobject obj, jint nativeEmojiFactory) { + JNIEnv* env, jobject obj, jlong nativeEmojiFactory) { EmojiFactory *factory = reinterpret_cast<EmojiFactory *>(nativeEmojiFactory); return factory->GetMaximumAndroidPua(); } static jint android_emoji_EmojiFactory_getMinimumAndroidPua( - JNIEnv* env, jobject obj, jint nativeEmojiFactory) { + JNIEnv* env, jobject obj, jlong nativeEmojiFactory) { EmojiFactory *factory = reinterpret_cast<EmojiFactory *>(nativeEmojiFactory); return factory->GetMinimumAndroidPua(); } @@ -236,25 +236,25 @@ static JNINativeMethod gMethods[] = { (void*)android_emoji_EmojiFactory_newInstance}, { "newAvailableInstance", "()Landroid/emoji/EmojiFactory;", (void*)android_emoji_EmojiFactory_newAvailableInstance}, - { "nativeDestructor", "(I)V", + { "nativeDestructor", "(J)V", (void*)android_emoji_EmojiFactory_destructor}, - { "nativeGetBitmapFromAndroidPua", "(II)Landroid/graphics/Bitmap;", + { "nativeGetBitmapFromAndroidPua", "(JI)Landroid/graphics/Bitmap;", (void*)android_emoji_EmojiFactory_getBitmapFromAndroidPua}, - { "nativeGetAndroidPuaFromVendorSpecificSjis", "(IC)I", + { "nativeGetAndroidPuaFromVendorSpecificSjis", "(JC)I", (void*)android_emoji_EmojiFactory_getAndroidPuaFromVendorSpecificSjis}, - { "nativeGetVendorSpecificSjisFromAndroidPua", "(II)I", + { "nativeGetVendorSpecificSjisFromAndroidPua", "(JI)I", (void*)android_emoji_EmojiFactory_getVendorSpecificSjisFromAndroidPua}, - { "nativeGetAndroidPuaFromVendorSpecificPua", "(II)I", + { "nativeGetAndroidPuaFromVendorSpecificPua", "(JI)I", (void*)android_emoji_EmojiFactory_getAndroidPuaFromVendorSpecificPua}, - { "nativeGetVendorSpecificPuaFromAndroidPua", "(II)I", + { "nativeGetVendorSpecificPuaFromAndroidPua", "(JI)I", (void*)android_emoji_EmojiFactory_getVendorSpecificPuaFromAndroidPua}, - { "nativeGetMaximumVendorSpecificPua", "(I)I", + { "nativeGetMaximumVendorSpecificPua", "(J)I", (void*)android_emoji_EmojiFactory_getMaximumVendorSpecificPua}, - { "nativeGetMinimumVendorSpecificPua", "(I)I", + { "nativeGetMinimumVendorSpecificPua", "(J)I", (void*)android_emoji_EmojiFactory_getMinimumVendorSpecificPua}, - { "nativeGetMaximumAndroidPua", "(I)I", + { "nativeGetMaximumAndroidPua", "(J)I", (void*)android_emoji_EmojiFactory_getMaximumAndroidPua}, - { "nativeGetMinimumAndroidPua", "(I)I", + { "nativeGetMinimumAndroidPua", "(J)I", (void*)android_emoji_EmojiFactory_getMinimumAndroidPua} }; @@ -276,7 +276,7 @@ static jfieldID getFieldIDCheck(JNIEnv* env, jclass clazz, int register_android_emoji_EmojiFactory(JNIEnv* env) { gEmojiFactory_class = make_globalref(env, "android/emoji/EmojiFactory"); gEmojiFactory_constructorMethodID = env->GetMethodID( - gEmojiFactory_class, "<init>", "(ILjava/lang/String;)V"); + gEmojiFactory_class, "<init>", "(JLjava/lang/String;)V"); return jniRegisterNativeMethods(env, "android/emoji/EmojiFactory", gMethods, NELEM(gMethods)); } diff --git a/core/jni/android_opengl_EGL14.cpp b/core/jni/android_opengl_EGL14.cpp index 1fe4b08..5b0a4b2 100644 --- a/core/jni/android_opengl_EGL14.cpp +++ b/core/jni/android_opengl_EGL14.cpp @@ -630,7 +630,7 @@ not_valid_surface: if (producer == NULL) goto not_valid_surface; - window = new android::Surface(producer); + window = new android::Surface(producer, true); if (window == NULL) goto not_valid_surface; diff --git a/core/jni/android_os_SELinux.cpp b/core/jni/android_os_SELinux.cpp index ca278cf..db84d00 100644 --- a/core/jni/android_os_SELinux.cpp +++ b/core/jni/android_os_SELinux.cpp @@ -411,7 +411,7 @@ static jboolean native_restorecon(JNIEnv *env, jobject, jstring pathnameStr) { ScopedUtfChars pathname(env, pathnameStr); if (pathname.c_str() == NULL) { - ALOGV("restorecon(%p) => threw exception", pathname); + ALOGV("restorecon(%p) => threw exception", pathnameStr); return false; } @@ -443,8 +443,21 @@ static JNINativeMethod method_table[] = { static int log_callback(int type, const char *fmt, ...) { va_list ap; + int priority; + + switch (type) { + case SELINUX_WARNING: + priority = ANDROID_LOG_WARN; + break; + case SELINUX_INFO: + priority = ANDROID_LOG_INFO; + break; + default: + priority = ANDROID_LOG_ERROR; + break; + } va_start(ap, fmt); - LOG_PRI_VA(ANDROID_LOG_ERROR, "SELinux", fmt, ap); + LOG_PRI_VA(priority, "SELinux", fmt, ap); va_end(ap); return 0; } diff --git a/core/jni/android_util_AssetManager.cpp b/core/jni/android_util_AssetManager.cpp index 8836918..7162a1c 100644 --- a/core/jni/android_util_AssetManager.cpp +++ b/core/jni/android_util_AssetManager.cpp @@ -35,7 +35,16 @@ #include <androidfw/AssetManager.h> #include <androidfw/ResourceTypes.h> +#include <private/android_filesystem_config.h> // for AID_SYSTEM + #include <stdio.h> +#include <sys/types.h> +#include <sys/wait.h> + +#include <linux/capability.h> +extern "C" int capget(cap_user_header_t hdrp, cap_user_data_t datap); +extern "C" int capset(cap_user_header_t hdrp, const cap_user_data_t datap); + namespace android { @@ -88,7 +97,7 @@ jint copyValue(JNIEnv* env, jobject outValue, const ResTable* table, { env->SetIntField(outValue, gTypedValueOffsets.mType, value.dataType); env->SetIntField(outValue, gTypedValueOffsets.mAssetCookie, - (jint)table->getTableCookie(block)); + static_cast<jint>(table->getTableCookie(block))); env->SetIntField(outValue, gTypedValueOffsets.mData, value.data); env->SetObjectField(outValue, gTypedValueOffsets.mString, NULL); env->SetIntField(outValue, gTypedValueOffsets.mResourceId, ref); @@ -100,12 +109,70 @@ jint copyValue(JNIEnv* env, jobject outValue, const ResTable* table, return block; } +// This is called by zygote (running as user root) as part of preloadResources. +static void verifySystemIdmaps() +{ + pid_t pid; + char system_id[10]; + + snprintf(system_id, sizeof(system_id), "%d", AID_SYSTEM); + + switch (pid = fork()) { + case -1: + ALOGE("failed to fork for idmap: %s", strerror(errno)); + break; + case 0: // child + { + struct __user_cap_header_struct capheader; + struct __user_cap_data_struct capdata; + + memset(&capheader, 0, sizeof(capheader)); + memset(&capdata, 0, sizeof(capdata)); + + capheader.version = _LINUX_CAPABILITY_VERSION; + capheader.pid = 0; + + if (capget(&capheader, &capdata) != 0) { + ALOGE("capget: %s\n", strerror(errno)); + exit(1); + } + + capdata.effective = capdata.permitted; + if (capset(&capheader, &capdata) != 0) { + ALOGE("capset: %s\n", strerror(errno)); + exit(1); + } + + if (setgid(AID_SYSTEM) != 0) { + ALOGE("setgid: %s\n", strerror(errno)); + exit(1); + } + + if (setuid(AID_SYSTEM) != 0) { + ALOGE("setuid: %s\n", strerror(errno)); + exit(1); + } + + execl(AssetManager::IDMAP_BIN, AssetManager::IDMAP_BIN, "--scan", + AssetManager::OVERLAY_DIR, AssetManager::TARGET_PACKAGE_NAME, + AssetManager::TARGET_APK_PATH, AssetManager::IDMAP_DIR, (char*)NULL); + ALOGE("failed to execl for idmap: %s", strerror(errno)); + exit(1); // should never get here + } + break; + default: // parent + waitpid(pid, NULL, 0); + break; + } +} + // ---------------------------------------------------------------------------- // this guy is exported to other jni routines AssetManager* assetManagerForJavaObject(JNIEnv* env, jobject obj) { - AssetManager* am = (AssetManager*)env->GetIntField(obj, gAssetManagerOffsets.mObject); + jlong amHandle = env->GetLongField(obj, gAssetManagerOffsets.mObject); + AssetManager* am = reinterpret_cast<AssetManager*>(amHandle); if (am != NULL) { return am; } @@ -113,7 +180,7 @@ AssetManager* assetManagerForJavaObject(JNIEnv* env, jobject obj) return NULL; } -static jint android_content_AssetManager_openAsset(JNIEnv* env, jobject clazz, +static jlong android_content_AssetManager_openAsset(JNIEnv* env, jobject clazz, jstring fileName, jint mode) { AssetManager* am = assetManagerForJavaObject(env, clazz); @@ -125,6 +192,7 @@ static jint android_content_AssetManager_openAsset(JNIEnv* env, jobject clazz, ScopedUtfChars fileName8(env, fileName); if (fileName8.c_str() == NULL) { + jniThrowException(env, "java/lang/IllegalArgumentException", "Empty file name"); return -1; } @@ -143,7 +211,7 @@ static jint android_content_AssetManager_openAsset(JNIEnv* env, jobject clazz, //printf("Created Asset Stream: %p\n", a); - return (jint)a; + return reinterpret_cast<jlong>(a); } static jobject returnParcelFileDescriptor(JNIEnv* env, Asset* a, jlongArray outOffsets) @@ -205,7 +273,7 @@ static jobject android_content_AssetManager_openAssetFd(JNIEnv* env, jobject cla return returnParcelFileDescriptor(env, a, outOffsets); } -static jint android_content_AssetManager_openNonAssetNative(JNIEnv* env, jobject clazz, +static jlong android_content_AssetManager_openNonAssetNative(JNIEnv* env, jobject clazz, jint cookie, jstring fileName, jint mode) @@ -240,7 +308,7 @@ static jint android_content_AssetManager_openNonAssetNative(JNIEnv* env, jobject //printf("Created Asset Stream: %p\n", a); - return (jint)a; + return reinterpret_cast<jlong>(a); } static jobject android_content_AssetManager_openNonAssetFdNative(JNIEnv* env, jobject clazz, @@ -320,9 +388,9 @@ static jobjectArray android_content_AssetManager_list(JNIEnv* env, jobject clazz } static void android_content_AssetManager_destroyAsset(JNIEnv* env, jobject clazz, - jint asset) + jlong assetHandle) { - Asset* a = (Asset*)asset; + Asset* a = reinterpret_cast<Asset*>(assetHandle); //printf("Destroying Asset Stream: %p\n", a); @@ -335,9 +403,9 @@ static void android_content_AssetManager_destroyAsset(JNIEnv* env, jobject clazz } static jint android_content_AssetManager_readAssetChar(JNIEnv* env, jobject clazz, - jint asset) + jlong assetHandle) { - Asset* a = (Asset*)asset; + Asset* a = reinterpret_cast<Asset*>(assetHandle); if (a == NULL) { jniThrowNullPointerException(env, "asset"); @@ -350,10 +418,10 @@ static jint android_content_AssetManager_readAssetChar(JNIEnv* env, jobject claz } static jint android_content_AssetManager_readAsset(JNIEnv* env, jobject clazz, - jint asset, jbyteArray bArray, + jlong assetHandle, jbyteArray bArray, jint off, jint len) { - Asset* a = (Asset*)asset; + Asset* a = reinterpret_cast<Asset*>(assetHandle); if (a == NULL || bArray == NULL) { jniThrowNullPointerException(env, "asset"); @@ -374,7 +442,7 @@ static jint android_content_AssetManager_readAsset(JNIEnv* env, jobject clazz, ssize_t res = a->read(b+off, len); env->ReleaseByteArrayElements(bArray, b, 0); - if (res > 0) return res; + if (res > 0) return static_cast<jint>(res); if (res < 0) { jniThrowException(env, "java/io/IOException", ""); @@ -383,10 +451,10 @@ static jint android_content_AssetManager_readAsset(JNIEnv* env, jobject clazz, } static jlong android_content_AssetManager_seekAsset(JNIEnv* env, jobject clazz, - jint asset, + jlong assetHandle, jlong offset, jint whence) { - Asset* a = (Asset*)asset; + Asset* a = reinterpret_cast<Asset*>(assetHandle); if (a == NULL) { jniThrowNullPointerException(env, "asset"); @@ -398,9 +466,9 @@ static jlong android_content_AssetManager_seekAsset(JNIEnv* env, jobject clazz, } static jlong android_content_AssetManager_getAssetLength(JNIEnv* env, jobject clazz, - jint asset) + jlong assetHandle) { - Asset* a = (Asset*)asset; + Asset* a = reinterpret_cast<Asset*>(assetHandle); if (a == NULL) { jniThrowNullPointerException(env, "asset"); @@ -411,9 +479,9 @@ static jlong android_content_AssetManager_getAssetLength(JNIEnv* env, jobject cl } static jlong android_content_AssetManager_getAssetRemainingLength(JNIEnv* env, jobject clazz, - jint asset) + jlong assetHandle) { - Asset* a = (Asset*)asset; + Asset* a = reinterpret_cast<Asset*>(assetHandle); if (a == NULL) { jniThrowNullPointerException(env, "asset"); @@ -442,6 +510,25 @@ static jint android_content_AssetManager_addAssetPath(JNIEnv* env, jobject clazz return (res) ? static_cast<jint>(cookie) : 0; } +static jint android_content_AssetManager_addOverlayPath(JNIEnv* env, jobject clazz, + jstring idmapPath) +{ + ScopedUtfChars idmapPath8(env, idmapPath); + if (idmapPath8.c_str() == NULL) { + return 0; + } + + AssetManager* am = assetManagerForJavaObject(env, clazz); + if (am == NULL) { + return 0; + } + + int32_t cookie; + bool res = am->addOverlayPath(String8(idmapPath8.c_str()), &cookie); + + return (res) ? (jint)cookie : 0; +} + static jboolean android_content_AssetManager_isUpToDate(JNIEnv* env, jobject clazz) { AssetManager* am = assetManagerForJavaObject(env, clazz); @@ -725,7 +812,11 @@ static jint android_content_AssetManager_loadResourceValue(JNIEnv* env, jobject } #endif } - return block >= 0 ? copyValue(env, outValue, &res, value, ref, block, typeSpecFlags, &config) : block; + if (block >= 0) { + return copyValue(env, outValue, &res, value, ref, block, typeSpecFlags, &config); + } + + return static_cast<jint>(block); } static jint android_content_AssetManager_loadResourceBagValue(JNIEnv* env, jobject clazz, @@ -759,7 +850,7 @@ static jint android_content_AssetManager_loadResourceBagValue(JNIEnv* env, jobje res.unlock(); if (block < 0) { - return block; + return static_cast<jint>(block); } uint32_t ref = ident; @@ -772,7 +863,11 @@ static jint android_content_AssetManager_loadResourceBagValue(JNIEnv* env, jobje } #endif } - return block >= 0 ? copyValue(env, outValue, &res, value, ref, block, typeSpecFlags) : block; + if (block >= 0) { + return copyValue(env, outValue, &res, value, ref, block, typeSpecFlags); + } + + return static_cast<jint>(block); } static jint android_content_AssetManager_getStringBlockCount(JNIEnv* env, jobject clazz) @@ -784,14 +879,14 @@ static jint android_content_AssetManager_getStringBlockCount(JNIEnv* env, jobjec return am->getResources().getTableCount(); } -static jint android_content_AssetManager_getNativeStringBlock(JNIEnv* env, jobject clazz, +static jlong android_content_AssetManager_getNativeStringBlock(JNIEnv* env, jobject clazz, jint block) { AssetManager* am = assetManagerForJavaObject(env, clazz); if (am == NULL) { return 0; } - return (jint)am->getResources().getTableStringBlock(block); + return reinterpret_cast<jlong>(am->getResources().getTableStringBlock(block)); } static jstring android_content_AssetManager_getCookieName(JNIEnv* env, jobject clazz, @@ -810,43 +905,43 @@ static jstring android_content_AssetManager_getCookieName(JNIEnv* env, jobject c return str; } -static jint android_content_AssetManager_newTheme(JNIEnv* env, jobject clazz) +static jlong android_content_AssetManager_newTheme(JNIEnv* env, jobject clazz) { AssetManager* am = assetManagerForJavaObject(env, clazz); if (am == NULL) { return 0; } - return (jint)(new ResTable::Theme(am->getResources())); + return reinterpret_cast<jlong>(new ResTable::Theme(am->getResources())); } static void android_content_AssetManager_deleteTheme(JNIEnv* env, jobject clazz, - jint themeInt) + jlong themeHandle) { - ResTable::Theme* theme = (ResTable::Theme*)themeInt; + ResTable::Theme* theme = reinterpret_cast<ResTable::Theme*>(themeHandle); delete theme; } static void android_content_AssetManager_applyThemeStyle(JNIEnv* env, jobject clazz, - jint themeInt, + jlong themeHandle, jint styleRes, jboolean force) { - ResTable::Theme* theme = (ResTable::Theme*)themeInt; + ResTable::Theme* theme = reinterpret_cast<ResTable::Theme*>(themeHandle); theme->applyStyle(styleRes, force ? true : false); } static void android_content_AssetManager_copyTheme(JNIEnv* env, jobject clazz, - jint destInt, jint srcInt) + jlong destHandle, jlong srcHandle) { - ResTable::Theme* dest = (ResTable::Theme*)destInt; - ResTable::Theme* src = (ResTable::Theme*)srcInt; + ResTable::Theme* dest = reinterpret_cast<ResTable::Theme*>(destHandle); + ResTable::Theme* src = reinterpret_cast<ResTable::Theme*>(srcHandle); dest->setTo(*src); } static jint android_content_AssetManager_loadThemeAttributeValue( - JNIEnv* env, jobject clazz, jint themeInt, jint ident, jobject outValue, jboolean resolve) + JNIEnv* env, jobject clazz, jlong themeHandle, jint ident, jobject outValue, jboolean resolve) { - ResTable::Theme* theme = (ResTable::Theme*)themeInt; + ResTable::Theme* theme = reinterpret_cast<ResTable::Theme*>(themeHandle); const ResTable& res(theme->getResTable()); Res_value value; @@ -867,10 +962,10 @@ static jint android_content_AssetManager_loadThemeAttributeValue( } static void android_content_AssetManager_dumpTheme(JNIEnv* env, jobject clazz, - jint themeInt, jint pri, + jlong themeHandle, jint pri, jstring tag, jstring prefix) { - ResTable::Theme* theme = (ResTable::Theme*)themeInt; + ResTable::Theme* theme = reinterpret_cast<ResTable::Theme*>(themeHandle); const ResTable& res(theme->getResTable()); // XXX Need to use params. @@ -878,10 +973,10 @@ static void android_content_AssetManager_dumpTheme(JNIEnv* env, jobject clazz, } static jboolean android_content_AssetManager_applyStyle(JNIEnv* env, jobject clazz, - jint themeToken, + jlong themeToken, jint defStyleAttr, jint defStyleRes, - jint xmlParserToken, + jlong xmlParserToken, jintArray attrs, jintArray outValues, jintArray outIndices) @@ -902,9 +997,9 @@ static jboolean android_content_AssetManager_applyStyle(JNIEnv* env, jobject cla DEBUG_STYLES(LOGI("APPLY STYLE: theme=0x%x defStyleAttr=0x%x defStyleRes=0x%x xml=0x%x", themeToken, defStyleAttr, defStyleRes, xmlParserToken)); - ResTable::Theme* theme = (ResTable::Theme*)themeToken; + ResTable::Theme* theme = reinterpret_cast<ResTable::Theme*>(themeToken); const ResTable& res = theme->getResTable(); - ResXMLParser* xmlParser = (ResXMLParser*)xmlParserToken; + ResXMLParser* xmlParser = reinterpret_cast<ResXMLParser*>(xmlParserToken); ResTable_config config; Res_value value; @@ -1097,7 +1192,7 @@ static jboolean android_content_AssetManager_applyStyle(JNIEnv* env, jobject cla dest[STYLE_TYPE] = value.dataType; dest[STYLE_DATA] = value.data; dest[STYLE_ASSET_COOKIE] = - block != kXmlBlock ? (jint)res.getTableCookie(block) : (jint)-1; + block != kXmlBlock ? reinterpret_cast<jint>(res.getTableCookie(block)) : (jint)-1; dest[STYLE_RESOURCE_ID] = resid; dest[STYLE_CHANGING_CONFIGURATIONS] = typeSetFlags; dest[STYLE_DENSITY] = config.density; @@ -1123,7 +1218,7 @@ static jboolean android_content_AssetManager_applyStyle(JNIEnv* env, jobject cla } static jboolean android_content_AssetManager_retrieveAttributes(JNIEnv* env, jobject clazz, - jint xmlParserToken, + jlong xmlParserToken, jintArray attrs, jintArray outValues, jintArray outIndices) @@ -1240,7 +1335,7 @@ static jboolean android_content_AssetManager_retrieveAttributes(JNIEnv* env, job dest[STYLE_TYPE] = value.dataType; dest[STYLE_DATA] = value.data; dest[STYLE_ASSET_COOKIE] = - block != kXmlBlock ? (jint)res.getTableCookie(block) : (jint)-1; + block != kXmlBlock ? reinterpret_cast<jint>(res.getTableCookie(block)) : (jint)-1; dest[STYLE_RESOURCE_ID] = resid; dest[STYLE_CHANGING_CONFIGURATIONS] = typeSetFlags; dest[STYLE_DENSITY] = config.density; @@ -1280,7 +1375,7 @@ static jint android_content_AssetManager_getArraySize(JNIEnv* env, jobject clazz ssize_t bagOff = res.getBagLocked(id, &defStyleEnt); res.unlock(); - return bagOff; + return static_cast<jint>(bagOff); } static jint android_content_AssetManager_retrieveArray(JNIEnv* env, jobject clazz, @@ -1352,7 +1447,7 @@ static jint android_content_AssetManager_retrieveArray(JNIEnv* env, jobject claz // Write the final value back to Java. dest[STYLE_TYPE] = value.dataType; dest[STYLE_DATA] = value.data; - dest[STYLE_ASSET_COOKIE] = (jint)res.getTableCookie(block); + dest[STYLE_ASSET_COOKIE] = reinterpret_cast<jint>(res.getTableCookie(block)); dest[STYLE_RESOURCE_ID] = resid; dest[STYLE_CHANGING_CONFIGURATIONS] = typeSetFlags; dest[STYLE_DENSITY] = config.density; @@ -1370,7 +1465,7 @@ static jint android_content_AssetManager_retrieveArray(JNIEnv* env, jobject claz return i; } -static jint android_content_AssetManager_openXmlAssetNative(JNIEnv* env, jobject clazz, +static jlong android_content_AssetManager_openXmlAssetNative(JNIEnv* env, jobject clazz, jint cookie, jstring fileName) { @@ -1405,7 +1500,7 @@ static jint android_content_AssetManager_openXmlAssetNative(JNIEnv* env, jobject return 0; } - return (jint)block; + return reinterpret_cast<jlong>(block); } static jintArray android_content_AssetManager_getArrayStringInfo(JNIEnv* env, jobject clazz, @@ -1569,8 +1664,11 @@ static jintArray android_content_AssetManager_getArrayIntResource(JNIEnv* env, j return array; } -static void android_content_AssetManager_init(JNIEnv* env, jobject clazz) +static void android_content_AssetManager_init(JNIEnv* env, jobject clazz, jboolean isSystem) { + if (isSystem) { + verifySystemIdmaps(); + } AssetManager* am = new AssetManager(); if (am == NULL) { jniThrowException(env, "java/lang/OutOfMemoryError", ""); @@ -1580,17 +1678,17 @@ static void android_content_AssetManager_init(JNIEnv* env, jobject clazz) am->addDefaultAssets(); ALOGV("Created AssetManager %p for Java object %p\n", am, clazz); - env->SetIntField(clazz, gAssetManagerOffsets.mObject, (jint)am); + env->SetLongField(clazz, gAssetManagerOffsets.mObject, reinterpret_cast<jlong>(am)); } static void android_content_AssetManager_destroy(JNIEnv* env, jobject clazz) { AssetManager* am = (AssetManager*) - (env->GetIntField(clazz, gAssetManagerOffsets.mObject)); + (env->GetLongField(clazz, gAssetManagerOffsets.mObject)); ALOGV("Destroying AssetManager %p for Java object %p\n", am, clazz); if (am != NULL) { delete am; - env->SetIntField(clazz, gAssetManagerOffsets.mObject, 0); + env->SetLongField(clazz, gAssetManagerOffsets.mObject, 0); } } @@ -1624,30 +1722,32 @@ static JNINativeMethod gAssetManagerMethods[] = { /* name, signature, funcPtr */ // Basic asset stuff. - { "openAsset", "(Ljava/lang/String;I)I", + { "openAsset", "(Ljava/lang/String;I)J", (void*) android_content_AssetManager_openAsset }, { "openAssetFd", "(Ljava/lang/String;[J)Landroid/os/ParcelFileDescriptor;", (void*) android_content_AssetManager_openAssetFd }, - { "openNonAssetNative", "(ILjava/lang/String;I)I", + { "openNonAssetNative", "(ILjava/lang/String;I)J", (void*) android_content_AssetManager_openNonAssetNative }, { "openNonAssetFdNative", "(ILjava/lang/String;[J)Landroid/os/ParcelFileDescriptor;", (void*) android_content_AssetManager_openNonAssetFdNative }, { "list", "(Ljava/lang/String;)[Ljava/lang/String;", (void*) android_content_AssetManager_list }, - { "destroyAsset", "(I)V", + { "destroyAsset", "(J)V", (void*) android_content_AssetManager_destroyAsset }, - { "readAssetChar", "(I)I", + { "readAssetChar", "(J)I", (void*) android_content_AssetManager_readAssetChar }, - { "readAsset", "(I[BII)I", + { "readAsset", "(J[BII)I", (void*) android_content_AssetManager_readAsset }, - { "seekAsset", "(IJI)J", + { "seekAsset", "(JJI)J", (void*) android_content_AssetManager_seekAsset }, - { "getAssetLength", "(I)J", + { "getAssetLength", "(J)J", (void*) android_content_AssetManager_getAssetLength }, - { "getAssetRemainingLength", "(I)J", + { "getAssetRemainingLength", "(J)J", (void*) android_content_AssetManager_getAssetRemainingLength }, { "addAssetPathNative", "(Ljava/lang/String;)I", (void*) android_content_AssetManager_addAssetPath }, + { "addOverlayPath", "(Ljava/lang/String;)I", + (void*) android_content_AssetManager_addOverlayPath }, { "isUpToDate", "()Z", (void*) android_content_AssetManager_isUpToDate }, @@ -1674,27 +1774,27 @@ static JNINativeMethod gAssetManagerMethods[] = { (void*) android_content_AssetManager_loadResourceBagValue }, { "getStringBlockCount","()I", (void*) android_content_AssetManager_getStringBlockCount }, - { "getNativeStringBlock","(I)I", + { "getNativeStringBlock","(I)J", (void*) android_content_AssetManager_getNativeStringBlock }, { "getCookieName","(I)Ljava/lang/String;", (void*) android_content_AssetManager_getCookieName }, // Themes. - { "newTheme", "()I", + { "newTheme", "()J", (void*) android_content_AssetManager_newTheme }, - { "deleteTheme", "(I)V", + { "deleteTheme", "(J)V", (void*) android_content_AssetManager_deleteTheme }, - { "applyThemeStyle", "(IIZ)V", + { "applyThemeStyle", "(JIZ)V", (void*) android_content_AssetManager_applyThemeStyle }, - { "copyTheme", "(II)V", + { "copyTheme", "(JJ)V", (void*) android_content_AssetManager_copyTheme }, - { "loadThemeAttributeValue", "(IILandroid/util/TypedValue;Z)I", + { "loadThemeAttributeValue", "(JILandroid/util/TypedValue;Z)I", (void*) android_content_AssetManager_loadThemeAttributeValue }, - { "dumpTheme", "(IILjava/lang/String;Ljava/lang/String;)V", + { "dumpTheme", "(JILjava/lang/String;Ljava/lang/String;)V", (void*) android_content_AssetManager_dumpTheme }, - { "applyStyle","(IIII[I[I[I)Z", + { "applyStyle","(JIIJ[I[I[I)Z", (void*) android_content_AssetManager_applyStyle }, - { "retrieveAttributes","(I[I[I[I)Z", + { "retrieveAttributes","(J[I[I[I)Z", (void*) android_content_AssetManager_retrieveAttributes }, { "getArraySize","(I)I", (void*) android_content_AssetManager_getArraySize }, @@ -1702,7 +1802,7 @@ static JNINativeMethod gAssetManagerMethods[] = { (void*) android_content_AssetManager_retrieveArray }, // XML files. - { "openXmlAssetNative", "(ILjava/lang/String;)I", + { "openXmlAssetNative", "(ILjava/lang/String;)J", (void*) android_content_AssetManager_openXmlAssetNative }, // Arrays. @@ -1714,7 +1814,7 @@ static JNINativeMethod gAssetManagerMethods[] = { (void*) android_content_AssetManager_getArrayIntResource }, // Bookkeeping. - { "init", "()V", + { "init", "(Z)V", (void*) android_content_AssetManager_init }, { "destroy", "()V", (void*) android_content_AssetManager_destroy }, @@ -1766,7 +1866,7 @@ int register_android_content_AssetManager(JNIEnv* env) jclass assetManager = env->FindClass("android/content/res/AssetManager"); LOG_FATAL_IF(assetManager == NULL, "Unable to find class android/content/res/AssetManager"); gAssetManagerOffsets.mObject - = env->GetFieldID(assetManager, "mObject", "I"); + = env->GetFieldID(assetManager, "mObject", "J"); LOG_FATAL_IF(gAssetManagerOffsets.mObject == NULL, "Unable to find AssetManager.mObject"); jclass stringClass = env->FindClass("java/lang/String"); diff --git a/core/jni/android_util_StringBlock.cpp b/core/jni/android_util_StringBlock.cpp index 463d3c0..f29250f 100644 --- a/core/jni/android_util_StringBlock.cpp +++ b/core/jni/android_util_StringBlock.cpp @@ -31,7 +31,7 @@ namespace android { // ---------------------------------------------------------------------------- -static jint android_content_StringBlock_nativeCreate(JNIEnv* env, jobject clazz, +static jlong android_content_StringBlock_nativeCreate(JNIEnv* env, jobject clazz, jbyteArray bArray, jint off, jint len) { @@ -56,13 +56,13 @@ static jint android_content_StringBlock_nativeCreate(JNIEnv* env, jobject clazz, return 0; } - return (jint)osb; + return reinterpret_cast<jlong>(osb); } static jint android_content_StringBlock_nativeGetSize(JNIEnv* env, jobject clazz, - jint token) + jlong token) { - ResStringPool* osb = (ResStringPool*)token; + ResStringPool* osb = reinterpret_cast<ResStringPool*>(token); if (osb == NULL) { jniThrowNullPointerException(env, NULL); return 0; @@ -72,9 +72,9 @@ static jint android_content_StringBlock_nativeGetSize(JNIEnv* env, jobject clazz } static jstring android_content_StringBlock_nativeGetString(JNIEnv* env, jobject clazz, - jint token, jint idx) + jlong token, jint idx) { - ResStringPool* osb = (ResStringPool*)token; + ResStringPool* osb = reinterpret_cast<ResStringPool*>(token); if (osb == NULL) { jniThrowNullPointerException(env, NULL); return 0; @@ -96,9 +96,9 @@ static jstring android_content_StringBlock_nativeGetString(JNIEnv* env, jobject } static jintArray android_content_StringBlock_nativeGetStyle(JNIEnv* env, jobject clazz, - jint token, jint idx) + jlong token, jint idx) { - ResStringPool* osb = (ResStringPool*)token; + ResStringPool* osb = reinterpret_cast<ResStringPool*>(token); if (osb == NULL) { jniThrowNullPointerException(env, NULL); return NULL; @@ -139,9 +139,9 @@ static jintArray android_content_StringBlock_nativeGetStyle(JNIEnv* env, jobject } static void android_content_StringBlock_nativeDestroy(JNIEnv* env, jobject clazz, - jint token) + jlong token) { - ResStringPool* osb = (ResStringPool*)token; + ResStringPool* osb = reinterpret_cast<ResStringPool*>(token); if (osb == NULL) { jniThrowNullPointerException(env, NULL); return; @@ -157,15 +157,15 @@ static void android_content_StringBlock_nativeDestroy(JNIEnv* env, jobject clazz */ static JNINativeMethod gStringBlockMethods[] = { /* name, signature, funcPtr */ - { "nativeCreate", "([BII)I", + { "nativeCreate", "([BII)J", (void*) android_content_StringBlock_nativeCreate }, - { "nativeGetSize", "(I)I", + { "nativeGetSize", "(J)I", (void*) android_content_StringBlock_nativeGetSize }, - { "nativeGetString", "(II)Ljava/lang/String;", + { "nativeGetString", "(JI)Ljava/lang/String;", (void*) android_content_StringBlock_nativeGetString }, - { "nativeGetStyle", "(II)[I", + { "nativeGetStyle", "(JI)[I", (void*) android_content_StringBlock_nativeGetStyle }, - { "nativeDestroy", "(I)V", + { "nativeDestroy", "(J)V", (void*) android_content_StringBlock_nativeDestroy }, }; diff --git a/core/jni/android_util_XmlBlock.cpp b/core/jni/android_util_XmlBlock.cpp index ad6033b..03de5c0 100644 --- a/core/jni/android_util_XmlBlock.cpp +++ b/core/jni/android_util_XmlBlock.cpp @@ -31,7 +31,7 @@ namespace android { // ---------------------------------------------------------------------------- -static jint android_content_XmlBlock_nativeCreate(JNIEnv* env, jobject clazz, +static jlong android_content_XmlBlock_nativeCreate(JNIEnv* env, jobject clazz, jbyteArray bArray, jint off, jint len) { @@ -55,25 +55,25 @@ static jint android_content_XmlBlock_nativeCreate(JNIEnv* env, jobject clazz, return 0; } - return (jint)osb; + return reinterpret_cast<jlong>(osb); } -static jint android_content_XmlBlock_nativeGetStringBlock(JNIEnv* env, jobject clazz, - jint token) +static jlong android_content_XmlBlock_nativeGetStringBlock(JNIEnv* env, jobject clazz, + jlong token) { - ResXMLTree* osb = (ResXMLTree*)token; + ResXMLTree* osb = reinterpret_cast<ResXMLTree*>(token); if (osb == NULL) { jniThrowNullPointerException(env, NULL); return 0; } - return (jint)&osb->getStrings(); + return reinterpret_cast<jlong>(&osb->getStrings()); } -static jint android_content_XmlBlock_nativeCreateParseState(JNIEnv* env, jobject clazz, - jint token) +static jlong android_content_XmlBlock_nativeCreateParseState(JNIEnv* env, jobject clazz, + jlong token) { - ResXMLTree* osb = (ResXMLTree*)token; + ResXMLTree* osb = reinterpret_cast<ResXMLTree*>(token); if (osb == NULL) { jniThrowNullPointerException(env, NULL); return 0; @@ -87,19 +87,19 @@ static jint android_content_XmlBlock_nativeCreateParseState(JNIEnv* env, jobject st->restart(); - return (jint)st; + return reinterpret_cast<jlong>(st); } static jint android_content_XmlBlock_nativeNext(JNIEnv* env, jobject clazz, - jint token) + jlong token) { - ResXMLParser* st = (ResXMLParser*)token; + ResXMLParser* st = reinterpret_cast<ResXMLParser*>(token); if (st == NULL) { return ResXMLParser::END_DOCUMENT; } do { - jint code = (jint)st->next(); + ResXMLParser::event_code_t code = st->next(); switch (code) { case ResXMLParser::START_TAG: return 2; @@ -123,139 +123,139 @@ bad: } static jint android_content_XmlBlock_nativeGetNamespace(JNIEnv* env, jobject clazz, - jint token) + jlong token) { - ResXMLParser* st = (ResXMLParser*)token; + ResXMLParser* st = reinterpret_cast<ResXMLParser*>(token); if (st == NULL) { return -1; } - return (jint)st->getElementNamespaceID(); + return static_cast<jint>(st->getElementNamespaceID()); } static jint android_content_XmlBlock_nativeGetName(JNIEnv* env, jobject clazz, - jint token) + jlong token) { - ResXMLParser* st = (ResXMLParser*)token; + ResXMLParser* st = reinterpret_cast<ResXMLParser*>(token); if (st == NULL) { return -1; } - return (jint)st->getElementNameID(); + return static_cast<jint>(st->getElementNameID()); } static jint android_content_XmlBlock_nativeGetText(JNIEnv* env, jobject clazz, - jint token) + jlong token) { - ResXMLParser* st = (ResXMLParser*)token; + ResXMLParser* st = reinterpret_cast<ResXMLParser*>(token); if (st == NULL) { return -1; } - return (jint)st->getTextID(); + return static_cast<jint>(st->getTextID()); } static jint android_content_XmlBlock_nativeGetLineNumber(JNIEnv* env, jobject clazz, - jint token) + jlong token) { - ResXMLParser* st = (ResXMLParser*)token; + ResXMLParser* st = reinterpret_cast<ResXMLParser*>(token); if (st == NULL) { jniThrowNullPointerException(env, NULL); return 0; } - return (jint)st->getLineNumber(); + return static_cast<jint>(st->getLineNumber()); } static jint android_content_XmlBlock_nativeGetAttributeCount(JNIEnv* env, jobject clazz, - jint token) + jlong token) { - ResXMLParser* st = (ResXMLParser*)token; + ResXMLParser* st = reinterpret_cast<ResXMLParser*>(token); if (st == NULL) { jniThrowNullPointerException(env, NULL); return 0; } - return (jint)st->getAttributeCount(); + return static_cast<jint>(st->getAttributeCount()); } static jint android_content_XmlBlock_nativeGetAttributeNamespace(JNIEnv* env, jobject clazz, - jint token, jint idx) + jlong token, jint idx) { - ResXMLParser* st = (ResXMLParser*)token; + ResXMLParser* st = reinterpret_cast<ResXMLParser*>(token); if (st == NULL) { jniThrowNullPointerException(env, NULL); return 0; } - return (jint)st->getAttributeNamespaceID(idx); + return static_cast<jint>(st->getAttributeNamespaceID(idx)); } static jint android_content_XmlBlock_nativeGetAttributeName(JNIEnv* env, jobject clazz, - jint token, jint idx) + jlong token, jint idx) { - ResXMLParser* st = (ResXMLParser*)token; + ResXMLParser* st = reinterpret_cast<ResXMLParser*>(token); if (st == NULL) { jniThrowNullPointerException(env, NULL); return 0; } - return (jint)st->getAttributeNameID(idx); + return static_cast<jint>(st->getAttributeNameID(idx)); } static jint android_content_XmlBlock_nativeGetAttributeResource(JNIEnv* env, jobject clazz, - jint token, jint idx) + jlong token, jint idx) { - ResXMLParser* st = (ResXMLParser*)token; + ResXMLParser* st = reinterpret_cast<ResXMLParser*>(token); if (st == NULL) { jniThrowNullPointerException(env, NULL); return 0; } - return (jint)st->getAttributeNameResID(idx); + return static_cast<jint>(st->getAttributeNameResID(idx)); } static jint android_content_XmlBlock_nativeGetAttributeDataType(JNIEnv* env, jobject clazz, - jint token, jint idx) + jlong token, jint idx) { - ResXMLParser* st = (ResXMLParser*)token; + ResXMLParser* st = reinterpret_cast<ResXMLParser*>(token); if (st == NULL) { jniThrowNullPointerException(env, NULL); return 0; } - return (jint)st->getAttributeDataType(idx); + return static_cast<jint>(st->getAttributeDataType(idx)); } static jint android_content_XmlBlock_nativeGetAttributeData(JNIEnv* env, jobject clazz, - jint token, jint idx) + jlong token, jint idx) { - ResXMLParser* st = (ResXMLParser*)token; + ResXMLParser* st = reinterpret_cast<ResXMLParser*>(token); if (st == NULL) { jniThrowNullPointerException(env, NULL); return 0; } - return (jint)st->getAttributeData(idx); + return static_cast<jint>(st->getAttributeData(idx)); } static jint android_content_XmlBlock_nativeGetAttributeStringValue(JNIEnv* env, jobject clazz, - jint token, jint idx) + jlong token, jint idx) { - ResXMLParser* st = (ResXMLParser*)token; + ResXMLParser* st = reinterpret_cast<ResXMLParser*>(token); if (st == NULL) { jniThrowNullPointerException(env, NULL); return 0; } - return (jint)st->getAttributeValueStringID(idx); + return static_cast<jint>(st->getAttributeValueStringID(idx)); } static jint android_content_XmlBlock_nativeGetAttributeIndex(JNIEnv* env, jobject clazz, - jint token, + jlong token, jstring ns, jstring name) { - ResXMLParser* st = (ResXMLParser*)token; + ResXMLParser* st = reinterpret_cast<ResXMLParser*>(token); if (st == NULL || name == NULL) { jniThrowNullPointerException(env, NULL); return 0; @@ -271,7 +271,7 @@ static jint android_content_XmlBlock_nativeGetAttributeIndex(JNIEnv* env, jobjec const char16_t* name16 = env->GetStringChars(name, NULL); jsize nameLen = env->GetStringLength(name); - jint idx = (jint)st->indexOfAttribute(ns16, nsLen, name16, nameLen); + jint idx = static_cast<jint>(st->indexOfAttribute(ns16, nsLen, name16, nameLen)); if (ns) { env->ReleaseStringChars(ns, ns16); @@ -282,35 +282,35 @@ static jint android_content_XmlBlock_nativeGetAttributeIndex(JNIEnv* env, jobjec } static jint android_content_XmlBlock_nativeGetIdAttribute(JNIEnv* env, jobject clazz, - jint token) + jlong token) { - ResXMLParser* st = (ResXMLParser*)token; + ResXMLParser* st = reinterpret_cast<ResXMLParser*>(token); if (st == NULL) { jniThrowNullPointerException(env, NULL); return 0; } ssize_t idx = st->indexOfID(); - return idx >= 0 ? (jint)st->getAttributeValueStringID(idx) : -1; + return idx >= 0 ? static_cast<jint>(st->getAttributeValueStringID(idx)) : -1; } static jint android_content_XmlBlock_nativeGetClassAttribute(JNIEnv* env, jobject clazz, - jint token) + jlong token) { - ResXMLParser* st = (ResXMLParser*)token; + ResXMLParser* st = reinterpret_cast<ResXMLParser*>(token); if (st == NULL) { jniThrowNullPointerException(env, NULL); return 0; } ssize_t idx = st->indexOfClass(); - return idx >= 0 ? (jint)st->getAttributeValueStringID(idx) : -1; + return idx >= 0 ? static_cast<jint>(st->getAttributeValueStringID(idx)) : -1; } static jint android_content_XmlBlock_nativeGetStyleAttribute(JNIEnv* env, jobject clazz, - jint token) + jlong token) { - ResXMLParser* st = (ResXMLParser*)token; + ResXMLParser* st = reinterpret_cast<ResXMLParser*>(token); if (st == NULL) { jniThrowNullPointerException(env, NULL); return 0; @@ -332,9 +332,9 @@ static jint android_content_XmlBlock_nativeGetStyleAttribute(JNIEnv* env, jobjec } static void android_content_XmlBlock_nativeDestroyParseState(JNIEnv* env, jobject clazz, - jint token) + jlong token) { - ResXMLParser* st = (ResXMLParser*)token; + ResXMLParser* st = reinterpret_cast<ResXMLParser*>(token); if (st == NULL) { jniThrowNullPointerException(env, NULL); return; @@ -344,9 +344,9 @@ static void android_content_XmlBlock_nativeDestroyParseState(JNIEnv* env, jobjec } static void android_content_XmlBlock_nativeDestroy(JNIEnv* env, jobject clazz, - jint token) + jlong token) { - ResXMLTree* osb = (ResXMLTree*)token; + ResXMLTree* osb = reinterpret_cast<ResXMLTree*>(token); if (osb == NULL) { jniThrowNullPointerException(env, NULL); return; @@ -362,47 +362,47 @@ static void android_content_XmlBlock_nativeDestroy(JNIEnv* env, jobject clazz, */ static JNINativeMethod gXmlBlockMethods[] = { /* name, signature, funcPtr */ - { "nativeCreate", "([BII)I", + { "nativeCreate", "([BII)J", (void*) android_content_XmlBlock_nativeCreate }, - { "nativeGetStringBlock", "(I)I", + { "nativeGetStringBlock", "(J)J", (void*) android_content_XmlBlock_nativeGetStringBlock }, - { "nativeCreateParseState", "(I)I", + { "nativeCreateParseState", "(J)J", (void*) android_content_XmlBlock_nativeCreateParseState }, - { "nativeNext", "(I)I", + { "nativeNext", "(J)I", (void*) android_content_XmlBlock_nativeNext }, - { "nativeGetNamespace", "(I)I", + { "nativeGetNamespace", "(J)I", (void*) android_content_XmlBlock_nativeGetNamespace }, - { "nativeGetName", "(I)I", + { "nativeGetName", "(J)I", (void*) android_content_XmlBlock_nativeGetName }, - { "nativeGetText", "(I)I", + { "nativeGetText", "(J)I", (void*) android_content_XmlBlock_nativeGetText }, - { "nativeGetLineNumber", "(I)I", + { "nativeGetLineNumber", "(J)I", (void*) android_content_XmlBlock_nativeGetLineNumber }, - { "nativeGetAttributeCount", "(I)I", + { "nativeGetAttributeCount", "(J)I", (void*) android_content_XmlBlock_nativeGetAttributeCount }, - { "nativeGetAttributeNamespace","(II)I", + { "nativeGetAttributeNamespace","(JI)I", (void*) android_content_XmlBlock_nativeGetAttributeNamespace }, - { "nativeGetAttributeName", "(II)I", + { "nativeGetAttributeName", "(JI)I", (void*) android_content_XmlBlock_nativeGetAttributeName }, - { "nativeGetAttributeResource", "(II)I", + { "nativeGetAttributeResource", "(JI)I", (void*) android_content_XmlBlock_nativeGetAttributeResource }, - { "nativeGetAttributeDataType", "(II)I", + { "nativeGetAttributeDataType", "(JI)I", (void*) android_content_XmlBlock_nativeGetAttributeDataType }, - { "nativeGetAttributeData", "(II)I", + { "nativeGetAttributeData", "(JI)I", (void*) android_content_XmlBlock_nativeGetAttributeData }, - { "nativeGetAttributeStringValue", "(II)I", + { "nativeGetAttributeStringValue", "(JI)I", (void*) android_content_XmlBlock_nativeGetAttributeStringValue }, - { "nativeGetAttributeIndex", "(ILjava/lang/String;Ljava/lang/String;)I", + { "nativeGetAttributeIndex", "(JLjava/lang/String;Ljava/lang/String;)I", (void*) android_content_XmlBlock_nativeGetAttributeIndex }, - { "nativeGetIdAttribute", "(I)I", + { "nativeGetIdAttribute", "(J)I", (void*) android_content_XmlBlock_nativeGetIdAttribute }, - { "nativeGetClassAttribute", "(I)I", + { "nativeGetClassAttribute", "(J)I", (void*) android_content_XmlBlock_nativeGetClassAttribute }, - { "nativeGetStyleAttribute", "(I)I", + { "nativeGetStyleAttribute", "(J)I", (void*) android_content_XmlBlock_nativeGetStyleAttribute }, - { "nativeDestroyParseState", "(I)V", + { "nativeDestroyParseState", "(J)V", (void*) android_content_XmlBlock_nativeDestroyParseState }, - { "nativeDestroy", "(I)V", + { "nativeDestroy", "(J)V", (void*) android_content_XmlBlock_nativeDestroy }, }; diff --git a/core/jni/android_view_Surface.cpp b/core/jni/android_view_Surface.cpp index 3342bab..c2d4ec0 100644 --- a/core/jni/android_view_Surface.cpp +++ b/core/jni/android_view_Surface.cpp @@ -113,7 +113,8 @@ jobject android_view_Surface_createFromIGraphicBufferProducer(JNIEnv* env, return NULL; } - jobject surfaceObj = env->NewObject(gSurfaceClassInfo.clazz, gSurfaceClassInfo.ctor, surface.get()); + jobject surfaceObj = env->NewObject(gSurfaceClassInfo.clazz, + gSurfaceClassInfo.ctor, (jlong)surface.get()); if (surfaceObj == NULL) { if (env->ExceptionCheck()) { ALOGE("Could not create instance of Surface from IGraphicBufferProducer."); diff --git a/core/jni/com_google_android_gles_jni_EGLImpl.cpp b/core/jni/com_google_android_gles_jni_EGLImpl.cpp index a0982bd..3035d15 100644 --- a/core/jni/com_google_android_gles_jni_EGLImpl.cpp +++ b/core/jni/com_google_android_gles_jni_EGLImpl.cpp @@ -50,36 +50,41 @@ static jfieldID gBitmap_NativeBitmapFieldID; static inline EGLDisplay getDisplay(JNIEnv* env, jobject o) { if (!o) return EGL_NO_DISPLAY; - return (EGLDisplay)env->GetIntField(o, gDisplay_EGLDisplayFieldID); + return (EGLDisplay)env->GetLongField(o, gDisplay_EGLDisplayFieldID); } static inline EGLSurface getSurface(JNIEnv* env, jobject o) { if (!o) return EGL_NO_SURFACE; - return (EGLSurface)env->GetIntField(o, gSurface_EGLSurfaceFieldID); + return (EGLSurface)env->GetLongField(o, gSurface_EGLSurfaceFieldID); } static inline EGLContext getContext(JNIEnv* env, jobject o) { if (!o) return EGL_NO_CONTEXT; - return (EGLContext)env->GetIntField(o, gContext_EGLContextFieldID); + return (EGLContext)env->GetLongField(o, gContext_EGLContextFieldID); } static inline EGLConfig getConfig(JNIEnv* env, jobject o) { if (!o) return 0; - return (EGLConfig)env->GetIntField(o, gConfig_EGLConfigFieldID); + return (EGLConfig)env->GetLongField(o, gConfig_EGLConfigFieldID); } + +static inline jboolean EglBoolToJBool(EGLBoolean eglBool) { + return eglBool == EGL_TRUE ? JNI_TRUE : JNI_FALSE; +} + static void nativeClassInit(JNIEnv *_env, jclass eglImplClass) { jclass config_class = _env->FindClass("com/google/android/gles_jni/EGLConfigImpl"); gConfig_class = (jclass) _env->NewGlobalRef(config_class); - gConfig_ctorID = _env->GetMethodID(gConfig_class, "<init>", "(I)V"); - gConfig_EGLConfigFieldID = _env->GetFieldID(gConfig_class, "mEGLConfig", "I"); + gConfig_ctorID = _env->GetMethodID(gConfig_class, "<init>", "(J)V"); + gConfig_EGLConfigFieldID = _env->GetFieldID(gConfig_class, "mEGLConfig", "J"); jclass display_class = _env->FindClass("com/google/android/gles_jni/EGLDisplayImpl"); - gDisplay_EGLDisplayFieldID = _env->GetFieldID(display_class, "mEGLDisplay", "I"); + gDisplay_EGLDisplayFieldID = _env->GetFieldID(display_class, "mEGLDisplay", "J"); jclass context_class = _env->FindClass("com/google/android/gles_jni/EGLContextImpl"); - gContext_EGLContextFieldID = _env->GetFieldID(context_class, "mEGLContext", "I"); + gContext_EGLContextFieldID = _env->GetFieldID(context_class, "mEGLContext", "J"); jclass surface_class = _env->FindClass("com/google/android/gles_jni/EGLSurfaceImpl"); - gSurface_EGLSurfaceFieldID = _env->GetFieldID(surface_class, "mEGLSurface", "I"); - gSurface_NativePixelRefFieldID = _env->GetFieldID(surface_class, "mNativePixelRef", "I"); + gSurface_EGLSurfaceFieldID = _env->GetFieldID(surface_class, "mEGLSurface", "J"); + gSurface_NativePixelRefFieldID = _env->GetFieldID(surface_class, "mNativePixelRef", "J"); jclass bitmap_class = _env->FindClass("android/graphics/Bitmap"); gBitmap_NativeBitmapFieldID = _env->GetFieldID(bitmap_class, "mNativeBitmap", "J"); @@ -123,7 +128,7 @@ static jboolean jni_eglInitialize(JNIEnv *_env, jobject _this, jobject display, } EGLDisplay dpy = getDisplay(_env, display); - jboolean success = eglInitialize(dpy, NULL, NULL); + EGLBoolean success = eglInitialize(dpy, NULL, NULL); if (success && major_minor) { int len = _env->GetArrayLength(major_minor); if (len) { @@ -134,7 +139,7 @@ static jboolean jni_eglInitialize(JNIEnv *_env, jobject _this, jobject display, _env->ReleasePrimitiveArrayCritical(major_minor, base, JNI_ABORT); } } - return success; + return EglBoolToJBool(success); } static jboolean jni_eglQueryContext(JNIEnv *_env, jobject _this, jobject display, @@ -146,14 +151,14 @@ static jboolean jni_eglQueryContext(JNIEnv *_env, jobject _this, jobject display } EGLDisplay dpy = getDisplay(_env, display); EGLContext ctx = getContext(_env, context); - jboolean success = JNI_FALSE; + EGLBoolean success = EGL_FALSE; int len = _env->GetArrayLength(value); if (len) { jint* base = (jint *)_env->GetPrimitiveArrayCritical(value, (jboolean *)0); success = eglQueryContext(dpy, ctx, attribute, base); _env->ReleasePrimitiveArrayCritical(value, base, JNI_ABORT); } - return success; + return EglBoolToJBool(success); } static jboolean jni_eglQuerySurface(JNIEnv *_env, jobject _this, jobject display, @@ -166,14 +171,14 @@ static jboolean jni_eglQuerySurface(JNIEnv *_env, jobject _this, jobject display EGLDisplay dpy = getDisplay(_env, display); EGLContext sur = getSurface(_env, surface); - jboolean success = JNI_FALSE; + EGLBoolean success = EGL_FALSE; int len = _env->GetArrayLength(value); if (len) { jint* base = (jint *)_env->GetPrimitiveArrayCritical(value, (jboolean *)0); success = eglQuerySurface(dpy, sur, attribute, base); _env->ReleasePrimitiveArrayCritical(value, base, JNI_ABORT); } - return success; + return EglBoolToJBool(success); } static jint jni_getInitCount(JNIEnv *_env, jobject _clazz, jobject display) { @@ -183,7 +188,7 @@ static jint jni_getInitCount(JNIEnv *_env, jobject _clazz, jobject display) { } static jboolean jni_eglReleaseThread(JNIEnv *_env, jobject _this) { - return eglReleaseThread(); + return EglBoolToJBool(eglReleaseThread()); } static jboolean jni_eglChooseConfig(JNIEnv *_env, jobject _this, jobject display, @@ -196,7 +201,7 @@ static jboolean jni_eglChooseConfig(JNIEnv *_env, jobject _this, jobject display return JNI_FALSE; } EGLDisplay dpy = getDisplay(_env, display); - jboolean success = JNI_FALSE; + EGLBoolean success = EGL_FALSE; if (configs == NULL) { config_size = 0; @@ -214,14 +219,14 @@ static jboolean jni_eglChooseConfig(JNIEnv *_env, jobject _this, jobject display if (success && configs!=NULL) { for (int i=0 ; i<num ; i++) { - jobject obj = _env->NewObject(gConfig_class, gConfig_ctorID, (jint)nativeConfigs[i]); + jobject obj = _env->NewObject(gConfig_class, gConfig_ctorID, reinterpret_cast<jlong>(nativeConfigs[i])); _env->SetObjectArrayElement(configs, i, obj); } } - return success; + return EglBoolToJBool(success); } -static jint jni_eglCreateContext(JNIEnv *_env, jobject _this, jobject display, +static jlong jni_eglCreateContext(JNIEnv *_env, jobject _this, jobject display, jobject config, jobject share_context, jintArray attrib_list) { if (display == NULL || config == NULL || share_context == NULL || !validAttribList(_env, attrib_list)) { @@ -234,10 +239,10 @@ static jint jni_eglCreateContext(JNIEnv *_env, jobject _this, jobject display, jint* base = beginNativeAttribList(_env, attrib_list); EGLContext ctx = eglCreateContext(dpy, cnf, shr, base); endNativeAttributeList(_env, attrib_list, base); - return (jint)ctx; + return reinterpret_cast<jlong>(ctx); } -static jint jni_eglCreatePbufferSurface(JNIEnv *_env, jobject _this, jobject display, +static jlong jni_eglCreatePbufferSurface(JNIEnv *_env, jobject _this, jobject display, jobject config, jintArray attrib_list) { if (display == NULL || config == NULL || !validAttribList(_env, attrib_list)) { @@ -249,7 +254,7 @@ static jint jni_eglCreatePbufferSurface(JNIEnv *_env, jobject _this, jobject dis jint* base = beginNativeAttribList(_env, attrib_list); EGLSurface sur = eglCreatePbufferSurface(dpy, cnf, base); endNativeAttributeList(_env, attrib_list, base); - return (jint)sur; + return reinterpret_cast<jlong>(sur); } static PixelFormat convertPixelFormat(SkBitmap::Config format) @@ -300,15 +305,15 @@ static void jni_eglCreatePixmapSurface(JNIEnv *_env, jobject _this, jobject out_ endNativeAttributeList(_env, attrib_list, base); if (sur != EGL_NO_SURFACE) { - _env->SetIntField(out_sur, gSurface_EGLSurfaceFieldID, (int)sur); - _env->SetIntField(out_sur, gSurface_NativePixelRefFieldID, (int)ref); + _env->SetLongField(out_sur, gSurface_EGLSurfaceFieldID, reinterpret_cast<jlong>(sur)); + _env->SetLongField(out_sur, gSurface_NativePixelRefFieldID, reinterpret_cast<jlong>(ref)); } else { ref->unlockPixels(); SkSafeUnref(ref); } } -static jint jni_eglCreateWindowSurface(JNIEnv *_env, jobject _this, jobject display, +static jlong jni_eglCreateWindowSurface(JNIEnv *_env, jobject _this, jobject display, jobject config, jobject native_window, jintArray attrib_list) { if (display == NULL || config == NULL || !validAttribList(_env, attrib_list)) { @@ -332,15 +337,15 @@ not_valid_surface: jint* base = beginNativeAttribList(_env, attrib_list); EGLSurface sur = eglCreateWindowSurface(dpy, cnf, window.get(), base); endNativeAttributeList(_env, attrib_list, base); - return (jint)sur; + return reinterpret_cast<jlong>(sur); } -static jint jni_eglCreateWindowSurfaceTexture(JNIEnv *_env, jobject _this, jobject display, +static jlong jni_eglCreateWindowSurfaceTexture(JNIEnv *_env, jobject _this, jobject display, jobject config, jobject native_window, jintArray attrib_list) { if (display == NULL || config == NULL || !validAttribList(_env, attrib_list)) { jniThrowException(_env, "java/lang/IllegalArgumentException", NULL); - return JNI_FALSE; + return 0; } EGLDisplay dpy = getDisplay(_env, display); EGLContext cnf = getConfig(_env, config); @@ -360,7 +365,7 @@ not_valid_surface: jint* base = beginNativeAttribList(_env, attrib_list); EGLSurface sur = eglCreateWindowSurface(dpy, cnf, window.get(), base); endNativeAttributeList(_env, attrib_list, base); - return (jint)sur; + return reinterpret_cast<jlong>(sur); } static jboolean jni_eglGetConfigAttrib(JNIEnv *_env, jobject _this, jobject display, @@ -372,13 +377,13 @@ static jboolean jni_eglGetConfigAttrib(JNIEnv *_env, jobject _this, jobject disp } EGLDisplay dpy = getDisplay(_env, display); EGLContext cnf = getConfig(_env, config); - jboolean success = JNI_FALSE; + EGLBoolean success = EGL_FALSE; jint localValue; success = eglGetConfigAttrib(dpy, cnf, attribute, &localValue); if (success) { _env->SetIntArrayRegion(value, 0, 1, &localValue); } - return success; + return EglBoolToJBool(success); } static jboolean jni_eglGetConfigs(JNIEnv *_env, jobject _this, jobject display, @@ -389,7 +394,7 @@ static jboolean jni_eglGetConfigs(JNIEnv *_env, jobject _this, jobject display, return JNI_FALSE; } EGLDisplay dpy = getDisplay(_env, display); - jboolean success = JNI_FALSE; + EGLBoolean success = EGL_FALSE; if (configs == NULL) { config_size = 0; } @@ -401,11 +406,11 @@ static jboolean jni_eglGetConfigs(JNIEnv *_env, jobject _this, jobject display, } if (success && configs) { for (int i=0 ; i<num ; i++) { - jobject obj = _env->NewObject(gConfig_class, gConfig_ctorID, (jint)nativeConfigs[i]); + jobject obj = _env->NewObject(gConfig_class, gConfig_ctorID, reinterpret_cast<jlong>(nativeConfigs[i])); _env->SetObjectArrayElement(configs, i, obj); } } - return success; + return EglBoolToJBool(success); } static jint jni_eglGetError(JNIEnv *_env, jobject _this) { @@ -413,20 +418,20 @@ static jint jni_eglGetError(JNIEnv *_env, jobject _this) { return error; } -static jint jni_eglGetCurrentContext(JNIEnv *_env, jobject _this) { - return (jint)eglGetCurrentContext(); +static jlong jni_eglGetCurrentContext(JNIEnv *_env, jobject _this) { + return reinterpret_cast<jlong>(eglGetCurrentContext()); } -static jint jni_eglGetCurrentDisplay(JNIEnv *_env, jobject _this) { - return (jint)eglGetCurrentDisplay(); +static jlong jni_eglGetCurrentDisplay(JNIEnv *_env, jobject _this) { + return reinterpret_cast<jlong>(eglGetCurrentDisplay()); } -static jint jni_eglGetCurrentSurface(JNIEnv *_env, jobject _this, jint readdraw) { +static jlong jni_eglGetCurrentSurface(JNIEnv *_env, jobject _this, jint readdraw) { if ((readdraw != EGL_READ) && (readdraw != EGL_DRAW)) { jniThrowException(_env, "java/lang/IllegalArgumentException", NULL); return 0; } - return (jint)eglGetCurrentSurface(readdraw); + return reinterpret_cast<jlong>(eglGetCurrentSurface(readdraw)); } static jboolean jni_eglDestroyContext(JNIEnv *_env, jobject _this, jobject display, jobject context) { @@ -436,7 +441,7 @@ static jboolean jni_eglDestroyContext(JNIEnv *_env, jobject _this, jobject displ } EGLDisplay dpy = getDisplay(_env, display); EGLContext ctx = getContext(_env, context); - return eglDestroyContext(dpy, ctx); + return EglBoolToJBool(eglDestroyContext(dpy, ctx)); } static jboolean jni_eglDestroySurface(JNIEnv *_env, jobject _this, jobject display, jobject surface) { @@ -448,18 +453,18 @@ static jboolean jni_eglDestroySurface(JNIEnv *_env, jobject _this, jobject displ EGLSurface sur = getSurface(_env, surface); if (sur) { - SkPixelRef* ref = (SkPixelRef*)(_env->GetIntField(surface, + SkPixelRef* ref = (SkPixelRef*)(_env->GetLongField(surface, gSurface_NativePixelRefFieldID)); if (ref) { ref->unlockPixels(); SkSafeUnref(ref); } } - return eglDestroySurface(dpy, sur); + return EglBoolToJBool(eglDestroySurface(dpy, sur)); } -static jint jni_eglGetDisplay(JNIEnv *_env, jobject _this, jobject native_display) { - return (jint)eglGetDisplay(EGL_DEFAULT_DISPLAY); +static jlong jni_eglGetDisplay(JNIEnv *_env, jobject _this, jobject native_display) { + return reinterpret_cast<jlong>(eglGetDisplay(EGL_DEFAULT_DISPLAY)); } static jboolean jni_eglMakeCurrent(JNIEnv *_env, jobject _this, jobject display, jobject draw, jobject read, jobject context) { @@ -471,7 +476,7 @@ static jboolean jni_eglMakeCurrent(JNIEnv *_env, jobject _this, jobject display, EGLSurface sdr = getSurface(_env, draw); EGLSurface srd = getSurface(_env, read); EGLContext ctx = getContext(_env, context); - return eglMakeCurrent(dpy, sdr, srd, ctx); + return EglBoolToJBool(eglMakeCurrent(dpy, sdr, srd, ctx)); } static jstring jni_eglQueryString(JNIEnv *_env, jobject _this, jobject display, jint name) { @@ -491,7 +496,7 @@ static jboolean jni_eglSwapBuffers(JNIEnv *_env, jobject _this, jobject display, } EGLDisplay dpy = getDisplay(_env, display); EGLSurface sur = getSurface(_env, surface); - return eglSwapBuffers(dpy, sur); + return EglBoolToJBool(eglSwapBuffers(dpy, sur)); } static jboolean jni_eglTerminate(JNIEnv *_env, jobject _this, jobject display) { @@ -500,7 +505,7 @@ static jboolean jni_eglTerminate(JNIEnv *_env, jobject _this, jobject display) { return JNI_FALSE; } EGLDisplay dpy = getDisplay(_env, display); - return eglTerminate(dpy); + return EglBoolToJBool(eglTerminate(dpy)); } static jboolean jni_eglCopyBuffers(JNIEnv *_env, jobject _this, jobject display, @@ -514,11 +519,11 @@ static jboolean jni_eglCopyBuffers(JNIEnv *_env, jobject _this, jobject display, } static jboolean jni_eglWaitGL(JNIEnv *_env, jobject _this) { - return eglWaitGL(); + return EglBoolToJBool(eglWaitGL()); } static jboolean jni_eglWaitNative(JNIEnv *_env, jobject _this, jint engine, jobject bindTarget) { - return eglWaitNative(engine); + return EglBoolToJBool(eglWaitNative(engine)); } @@ -540,21 +545,21 @@ static JNINativeMethod methods[] = { {"eglReleaseThread","()Z", (void*)jni_eglReleaseThread }, {"getInitCount", "(" DISPLAY ")I", (void*)jni_getInitCount }, {"eglChooseConfig", "(" DISPLAY "[I[" CONFIG "I[I)Z", (void*)jni_eglChooseConfig }, -{"_eglCreateContext","(" DISPLAY CONFIG CONTEXT "[I)I", (void*)jni_eglCreateContext }, +{"_eglCreateContext","(" DISPLAY CONFIG CONTEXT "[I)J", (void*)jni_eglCreateContext }, {"eglGetConfigs", "(" DISPLAY "[" CONFIG "I[I)Z", (void*)jni_eglGetConfigs }, {"eglTerminate", "(" DISPLAY ")Z", (void*)jni_eglTerminate }, {"eglCopyBuffers", "(" DISPLAY SURFACE OBJECT ")Z", (void*)jni_eglCopyBuffers }, {"eglWaitNative", "(I" OBJECT ")Z", (void*)jni_eglWaitNative }, {"eglGetError", "()I", (void*)jni_eglGetError }, {"eglGetConfigAttrib", "(" DISPLAY CONFIG "I[I)Z", (void*)jni_eglGetConfigAttrib }, -{"_eglGetDisplay", "(" OBJECT ")I", (void*)jni_eglGetDisplay }, -{"_eglGetCurrentContext", "()I", (void*)jni_eglGetCurrentContext }, -{"_eglGetCurrentDisplay", "()I", (void*)jni_eglGetCurrentDisplay }, -{"_eglGetCurrentSurface", "(I)I", (void*)jni_eglGetCurrentSurface }, -{"_eglCreatePbufferSurface","(" DISPLAY CONFIG "[I)I", (void*)jni_eglCreatePbufferSurface }, +{"_eglGetDisplay", "(" OBJECT ")J", (void*)jni_eglGetDisplay }, +{"_eglGetCurrentContext", "()J", (void*)jni_eglGetCurrentContext }, +{"_eglGetCurrentDisplay", "()J", (void*)jni_eglGetCurrentDisplay }, +{"_eglGetCurrentSurface", "(I)J", (void*)jni_eglGetCurrentSurface }, +{"_eglCreatePbufferSurface","(" DISPLAY CONFIG "[I)J", (void*)jni_eglCreatePbufferSurface }, {"_eglCreatePixmapSurface", "(" SURFACE DISPLAY CONFIG OBJECT "[I)V", (void*)jni_eglCreatePixmapSurface }, -{"_eglCreateWindowSurface", "(" DISPLAY CONFIG OBJECT "[I)I", (void*)jni_eglCreateWindowSurface }, -{"_eglCreateWindowSurfaceTexture", "(" DISPLAY CONFIG OBJECT "[I)I", (void*)jni_eglCreateWindowSurfaceTexture }, +{"_eglCreateWindowSurface", "(" DISPLAY CONFIG OBJECT "[I)J", (void*)jni_eglCreateWindowSurface }, +{"_eglCreateWindowSurfaceTexture", "(" DISPLAY CONFIG OBJECT "[I)J", (void*)jni_eglCreateWindowSurfaceTexture }, {"eglDestroyContext", "(" DISPLAY CONTEXT ")Z", (void*)jni_eglDestroyContext }, {"eglDestroySurface", "(" DISPLAY SURFACE ")Z", (void*)jni_eglDestroySurface }, {"eglMakeCurrent", "(" DISPLAY SURFACE SURFACE CONTEXT")Z", (void*)jni_eglMakeCurrent }, diff --git a/core/res/res/values/attrs_manifest.xml b/core/res/res/values/attrs_manifest.xml index b20f5ba..4647413 100644 --- a/core/res/res/values/attrs_manifest.xml +++ b/core/res/res/values/attrs_manifest.xml @@ -1777,6 +1777,16 @@ <attr name="publicKey" /> </declare-styleable> + <!-- Attributes relating to resource overlay packages. --> + <declare-styleable name="AndroidManifestResourceOverlay" parent="AndroidManifest"> + <!-- Package name of base package whose resources will be overlaid. --> + <attr name="targetPackage" /> + + <!-- Load order of overlay package. --> + <attr name="priority" /> + + </declare-styleable> + <!-- Declaration of an {@link android.content.Intent} object in XML. May also include zero or more {@link #IntentCategory <category> and {@link #Extra <extra>} tags. --> diff --git a/core/tests/overlaytests/OverlayAppFirst/Android.mk b/core/tests/overlaytests/OverlayAppFirst/Android.mk new file mode 100644 index 0000000..ee991fc --- /dev/null +++ b/core/tests/overlaytests/OverlayAppFirst/Android.mk @@ -0,0 +1,12 @@ +LOCAL_PATH := $(call my-dir) +include $(CLEAR_VARS) + +LOCAL_MODULE_TAGS := tests + +LOCAL_SRC_FILES := $(call all-java-files-under, src) + +LOCAL_SDK_VERSION := current + +LOCAL_PACKAGE_NAME := com.android.overlaytest.first_app_overlay + +include $(BUILD_PACKAGE) diff --git a/core/tests/overlaytests/OverlayAppFirst/AndroidManifest.xml b/core/tests/overlaytests/OverlayAppFirst/AndroidManifest.xml new file mode 100644 index 0000000..ec10bbc --- /dev/null +++ b/core/tests/overlaytests/OverlayAppFirst/AndroidManifest.xml @@ -0,0 +1,6 @@ +<manifest xmlns:android="http://schemas.android.com/apk/res/android" + package="com.android.overlaytest.first_app_overlay" + android:versionCode="1" + android:versionName="1.0"> + <overlay android:targetPackage="com.android.overlaytest" android:priority="1"/> +</manifest> diff --git a/core/tests/overlaytests/OverlayTestOverlay/res/drawable-nodpi/default_wallpaper.jpg b/core/tests/overlaytests/OverlayAppFirst/res/drawable-nodpi/drawable.jpg Binary files differindex 0d944d0..0d944d0 100644 --- a/core/tests/overlaytests/OverlayTestOverlay/res/drawable-nodpi/default_wallpaper.jpg +++ b/core/tests/overlaytests/OverlayAppFirst/res/drawable-nodpi/drawable.jpg diff --git a/core/tests/overlaytests/OverlayAppFirst/res/raw/lorem_ipsum.txt b/core/tests/overlaytests/OverlayAppFirst/res/raw/lorem_ipsum.txt new file mode 100644 index 0000000..756b0a3 --- /dev/null +++ b/core/tests/overlaytests/OverlayAppFirst/res/raw/lorem_ipsum.txt @@ -0,0 +1 @@ +Lorem ipsum: single overlay. diff --git a/core/tests/overlaytests/OverlayAppFirst/res/values-sv/config.xml b/core/tests/overlaytests/OverlayAppFirst/res/values-sv/config.xml new file mode 100644 index 0000000..9cdc73e --- /dev/null +++ b/core/tests/overlaytests/OverlayAppFirst/res/values-sv/config.xml @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="utf-8"?> +<resources> + <integer name="matrix_100100">400</integer> + <integer name="matrix_100101">400</integer> + <integer name="matrix_100110">400</integer> + <integer name="matrix_100111">400</integer> + <integer name="matrix_101100">400</integer> + <integer name="matrix_101101">400</integer> + <integer name="matrix_101110">400</integer> + <integer name="matrix_101111">400</integer> + <integer name="matrix_110100">400</integer> + <integer name="matrix_110101">400</integer> + <integer name="matrix_110110">400</integer> + <integer name="matrix_110111">400</integer> + <integer name="matrix_111100">400</integer> + <integer name="matrix_111101">400</integer> + <integer name="matrix_111110">400</integer> + <integer name="matrix_111111">400</integer> +</resources> diff --git a/core/tests/overlaytests/OverlayAppFirst/res/values/config.xml b/core/tests/overlaytests/OverlayAppFirst/res/values/config.xml new file mode 100644 index 0000000..972137a --- /dev/null +++ b/core/tests/overlaytests/OverlayAppFirst/res/values/config.xml @@ -0,0 +1,35 @@ +<?xml version="1.0" encoding="utf-8"?> +<resources> + <string name="str">single</string> + <string name="str2">single</string> + <integer name="matrix_101000">300</integer> + <integer name="matrix_101001">300</integer> + <integer name="matrix_101010">300</integer> + <integer name="matrix_101011">300</integer> + <integer name="matrix_101100">300</integer> + <integer name="matrix_101101">300</integer> + <integer name="matrix_101110">300</integer> + <integer name="matrix_101111">300</integer> + <integer name="matrix_111000">300</integer> + <integer name="matrix_111001">300</integer> + <integer name="matrix_111010">300</integer> + <integer name="matrix_111011">300</integer> + <integer name="matrix_111100">300</integer> + <integer name="matrix_111101">300</integer> + <integer name="matrix_111110">300</integer> + <integer name="matrix_111111">300</integer> + <bool name="usually_false">true</bool> + <integer-array name="fibonacci"> + <item>21</item> + <item>13</item> + <item>8</item> + <item>5</item> + <item>3</item> + <item>2</item> + <item>1</item> + <item>1</item> + </integer-array> + <!-- The following integer does not exist in the original package. Idmap + generation should therefore ignore it. --> + <integer name="integer_not_in_original_package">0</integer> +</resources> diff --git a/core/tests/overlaytests/OverlayAppFirst/res/xml/integer.xml b/core/tests/overlaytests/OverlayAppFirst/res/xml/integer.xml new file mode 100644 index 0000000..7f628d9 --- /dev/null +++ b/core/tests/overlaytests/OverlayAppFirst/res/xml/integer.xml @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="utf-8"?> +<integer value="1"/> diff --git a/core/tests/overlaytests/OverlayAppSecond/Android.mk b/core/tests/overlaytests/OverlayAppSecond/Android.mk new file mode 100644 index 0000000..87402c4 --- /dev/null +++ b/core/tests/overlaytests/OverlayAppSecond/Android.mk @@ -0,0 +1,12 @@ +LOCAL_PATH := $(call my-dir) +include $(CLEAR_VARS) + +LOCAL_MODULE_TAGS := tests + +LOCAL_SRC_FILES := $(call all-java-files-under, src) + +LOCAL_SDK_VERSION := current + +LOCAL_PACKAGE_NAME := com.android.overlaytest.second_app_overlay + +include $(BUILD_PACKAGE) diff --git a/core/tests/overlaytests/OverlayAppSecond/AndroidManifest.xml b/core/tests/overlaytests/OverlayAppSecond/AndroidManifest.xml new file mode 100644 index 0000000..ed49863 --- /dev/null +++ b/core/tests/overlaytests/OverlayAppSecond/AndroidManifest.xml @@ -0,0 +1,6 @@ +<manifest xmlns:android="http://schemas.android.com/apk/res/android" + package="com.android.overlaytest.second_app_overlay" + android:versionCode="1" + android:versionName="1.0"> + <overlay android:targetPackage="com.android.overlaytest" android:priority="2"/> +</manifest> diff --git a/core/tests/overlaytests/OverlayAppSecond/res/raw/lorem_ipsum.txt b/core/tests/overlaytests/OverlayAppSecond/res/raw/lorem_ipsum.txt new file mode 100644 index 0000000..613f5b6 --- /dev/null +++ b/core/tests/overlaytests/OverlayAppSecond/res/raw/lorem_ipsum.txt @@ -0,0 +1 @@ +Lorem ipsum: multiple overlays. diff --git a/core/tests/overlaytests/OverlayAppSecond/res/values-sv/config.xml b/core/tests/overlaytests/OverlayAppSecond/res/values-sv/config.xml new file mode 100644 index 0000000..ec4b6c0 --- /dev/null +++ b/core/tests/overlaytests/OverlayAppSecond/res/values-sv/config.xml @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="utf-8"?> +<resources> + <integer name="matrix_100001">600</integer> + <integer name="matrix_100011">600</integer> + <integer name="matrix_100101">600</integer> + <integer name="matrix_100111">600</integer> + <integer name="matrix_101001">600</integer> + <integer name="matrix_101011">600</integer> + <integer name="matrix_101101">600</integer> + <integer name="matrix_101111">600</integer> + <integer name="matrix_110001">600</integer> + <integer name="matrix_110011">600</integer> + <integer name="matrix_110101">600</integer> + <integer name="matrix_110111">600</integer> + <integer name="matrix_111001">600</integer> + <integer name="matrix_111011">600</integer> + <integer name="matrix_111101">600</integer> + <integer name="matrix_111111">600</integer> +</resources> diff --git a/core/tests/overlaytests/OverlayAppSecond/res/values/config.xml b/core/tests/overlaytests/OverlayAppSecond/res/values/config.xml new file mode 100644 index 0000000..8b07216 --- /dev/null +++ b/core/tests/overlaytests/OverlayAppSecond/res/values/config.xml @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="utf-8"?> +<resources> + <string name="str">multiple</string> + <integer name="matrix_100010">500</integer> + <integer name="matrix_100011">500</integer> + <integer name="matrix_100110">500</integer> + <integer name="matrix_100111">500</integer> + <integer name="matrix_101010">500</integer> + <integer name="matrix_101011">500</integer> + <integer name="matrix_101110">500</integer> + <integer name="matrix_101111">500</integer> + <integer name="matrix_110010">500</integer> + <integer name="matrix_110011">500</integer> + <integer name="matrix_110110">500</integer> + <integer name="matrix_110111">500</integer> + <integer name="matrix_111010">500</integer> + <integer name="matrix_111011">500</integer> + <integer name="matrix_111110">500</integer> + <integer name="matrix_111111">500</integer> + <bool name="usually_false">false</bool> +</resources> diff --git a/core/tests/overlaytests/OverlayAppSecond/res/xml/integer.xml b/core/tests/overlaytests/OverlayAppSecond/res/xml/integer.xml new file mode 100644 index 0000000..f3370a6 --- /dev/null +++ b/core/tests/overlaytests/OverlayAppSecond/res/xml/integer.xml @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="utf-8"?> +<integer value="2"/> diff --git a/core/tests/overlaytests/OverlayTest/Android.mk b/core/tests/overlaytests/OverlayTest/Android.mk index f7f67f6..4767e52 100644 --- a/core/tests/overlaytests/OverlayTest/Android.mk +++ b/core/tests/overlaytests/OverlayTest/Android.mk @@ -5,6 +5,10 @@ LOCAL_MODULE_TAGS := tests LOCAL_PACKAGE_NAME := OverlayTest +LOCAL_DEX_PREOPT := false + +LOCAL_MODULE_PATH := $(TARGET_OUT)/app + LOCAL_SRC_FILES := $(call all-java-files-under, src) include $(BUILD_PACKAGE) diff --git a/core/tests/overlaytests/OverlayTest/res/drawable-nodpi/drawable.jpg b/core/tests/overlaytests/OverlayTest/res/drawable-nodpi/drawable.jpg Binary files differnew file mode 100644 index 0000000..a3f14f3 --- /dev/null +++ b/core/tests/overlaytests/OverlayTest/res/drawable-nodpi/drawable.jpg diff --git a/core/tests/overlaytests/OverlayTest/res/raw/lorem_ipsum.txt b/core/tests/overlaytests/OverlayTest/res/raw/lorem_ipsum.txt new file mode 100644 index 0000000..cee7a92 --- /dev/null +++ b/core/tests/overlaytests/OverlayTest/res/raw/lorem_ipsum.txt @@ -0,0 +1 @@ +Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. diff --git a/core/tests/overlaytests/OverlayTest/res/values-sv/config.xml b/core/tests/overlaytests/OverlayTest/res/values-sv/config.xml new file mode 100644 index 0000000..891853e --- /dev/null +++ b/core/tests/overlaytests/OverlayTest/res/values-sv/config.xml @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="utf-8"?> +<resources> + <integer name="matrix_110000">200</integer> + <integer name="matrix_110001">200</integer> + <integer name="matrix_110010">200</integer> + <integer name="matrix_110011">200</integer> + <integer name="matrix_110100">200</integer> + <integer name="matrix_110101">200</integer> + <integer name="matrix_110110">200</integer> + <integer name="matrix_110111">200</integer> + <integer name="matrix_111000">200</integer> + <integer name="matrix_111001">200</integer> + <integer name="matrix_111010">200</integer> + <integer name="matrix_111011">200</integer> + <integer name="matrix_111100">200</integer> + <integer name="matrix_111101">200</integer> + <integer name="matrix_111110">200</integer> + <integer name="matrix_111111">200</integer> +</resources> diff --git a/core/tests/overlaytests/OverlayTest/res/values/config.xml b/core/tests/overlaytests/OverlayTest/res/values/config.xml new file mode 100644 index 0000000..c692a26 --- /dev/null +++ b/core/tests/overlaytests/OverlayTest/res/values/config.xml @@ -0,0 +1,59 @@ +<?xml version="1.0" encoding="utf-8"?> +<resources> + <string name="str">none</string> + <string name="str2">none</string> + <integer name="matrix_100000">100</integer> + <integer name="matrix_100001">100</integer> + <integer name="matrix_100010">100</integer> + <integer name="matrix_100011">100</integer> + <integer name="matrix_100100">100</integer> + <integer name="matrix_100101">100</integer> + <integer name="matrix_100110">100</integer> + <integer name="matrix_100111">100</integer> + <integer name="matrix_101000">100</integer> + <integer name="matrix_101001">100</integer> + <integer name="matrix_101010">100</integer> + <integer name="matrix_101011">100</integer> + <integer name="matrix_101100">100</integer> + <integer name="matrix_101101">100</integer> + <integer name="matrix_101110">100</integer> + <integer name="matrix_101111">100</integer> + <integer name="matrix_110000">100</integer> + <integer name="matrix_110001">100</integer> + <integer name="matrix_110010">100</integer> + <integer name="matrix_110011">100</integer> + <integer name="matrix_110100">100</integer> + <integer name="matrix_110101">100</integer> + <integer name="matrix_110110">100</integer> + <integer name="matrix_110111">100</integer> + <integer name="matrix_111000">100</integer> + <integer name="matrix_111001">100</integer> + <integer name="matrix_111010">100</integer> + <integer name="matrix_111011">100</integer> + <integer name="matrix_111100">100</integer> + <integer name="matrix_111101">100</integer> + <integer name="matrix_111110">100</integer> + <integer name="matrix_111111">100</integer> + <bool name="usually_false">false</bool> + <bool name="always_true">true</bool> + <integer-array name="fibonacci"> + <item>1</item> + <item>1</item> + <item>2</item> + <item>3</item> + <item>5</item> + <item>8</item> + <item>13</item> + <item>21</item> + </integer-array> + <integer-array name="prime_numbers"> + <item>2</item> + <item>3</item> + <item>5</item> + <item>7</item> + <item>11</item> + <item>13</item> + <item>17</item> + <item>19</item> + </integer-array> +</resources> diff --git a/core/tests/overlaytests/OverlayTest/res/xml/integer.xml b/core/tests/overlaytests/OverlayTest/res/xml/integer.xml new file mode 100644 index 0000000..9383daa --- /dev/null +++ b/core/tests/overlaytests/OverlayTest/res/xml/integer.xml @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="utf-8"?> +<integer value="0"/> diff --git a/core/tests/overlaytests/OverlayTest/src/com/android/overlaytest/OverlayBaseTest.java b/core/tests/overlaytests/OverlayTest/src/com/android/overlaytest/OverlayBaseTest.java index 6211c1c..58b7db9 100644 --- a/core/tests/overlaytests/OverlayTest/src/com/android/overlaytest/OverlayBaseTest.java +++ b/core/tests/overlaytests/OverlayTest/src/com/android/overlaytest/OverlayBaseTest.java @@ -2,13 +2,21 @@ package com.android.overlaytest; import android.content.res.Configuration; import android.content.res.Resources; +import android.content.res.XmlResourceParser; import android.test.AndroidTestCase; +import android.util.AttributeSet; +import android.util.Xml; +import java.io.BufferedReader; import java.io.InputStream; +import java.io.InputStreamReader; import java.util.Locale; public abstract class OverlayBaseTest extends AndroidTestCase { private Resources mResources; - protected boolean mWithOverlay; // will be set by subclasses + protected int mMode; // will be set by subclasses + static final protected int MODE_NO_OVERLAY = 0; + static final protected int MODE_SINGLE_OVERLAY = 1; + static final protected int MODE_MULTIPLE_OVERLAYS = 2; protected void setUp() { mResources = getContext().getResources(); @@ -36,20 +44,82 @@ public abstract class OverlayBaseTest extends AndroidTestCase { mResources.updateConfiguration(config, mResources.getDisplayMetrics()); } - private void assertResource(int resId, boolean ewo, boolean ew) throws Throwable { - boolean expected = mWithOverlay ? ew : ewo; + private boolean getExpected(boolean no, boolean so, boolean mo) { + switch (mMode) { + case MODE_NO_OVERLAY: + return no; + case MODE_SINGLE_OVERLAY: + return so; + case MODE_MULTIPLE_OVERLAYS: + return mo; + default: + fail("Unknown mode!"); + return no; + } + } + + private String getExpected(String no, String so, String mo) { + switch (mMode) { + case MODE_NO_OVERLAY: + return no; + case MODE_SINGLE_OVERLAY: + return so; + case MODE_MULTIPLE_OVERLAYS: + return mo; + default: + fail("Unknown mode!"); + return no; + } + } + + private int getExpected(int no, int so, int mo) { + switch (mMode) { + case MODE_NO_OVERLAY: + return no; + case MODE_SINGLE_OVERLAY: + return so; + case MODE_MULTIPLE_OVERLAYS: + return mo; + default: + fail("Unknown mode!"); + return no; + } + } + + private int[] getExpected(int[] no, int[] so, int[] mo) { + switch (mMode) { + case MODE_NO_OVERLAY: + return no; + case MODE_SINGLE_OVERLAY: + return so; + case MODE_MULTIPLE_OVERLAYS: + return mo; + default: + fail("Unknown mode!"); + return no; + } + } + + private void assertResource(int resId, boolean no, boolean so, boolean mo) throws Throwable { + boolean expected = getExpected(no, so, mo); boolean actual = mResources.getBoolean(resId); assertEquals(expected, actual); } - private void assertResource(int resId, String ewo, String ew) throws Throwable { - String expected = mWithOverlay ? ew : ewo; + private void assertResource(int resId, int no, int so, int mo) throws Throwable { + int expected = getExpected(no, so, mo); + int actual = mResources.getInteger(resId); + assertEquals(expected, actual); + } + + private void assertResource(int resId, String no, String so, String mo) throws Throwable { + String expected = getExpected(no, so, mo); String actual = mResources.getString(resId); assertEquals(expected, actual); } - private void assertResource(int resId, int[] ewo, int[] ew) throws Throwable { - int[] expected = mWithOverlay ? ew : ewo; + private void assertResource(int resId, int[] no, int[] so, int[] mo) throws Throwable { + int[] expected = getExpected(no, so, mo); int[] actual = mResources.getIntArray(resId); assertEquals("length:", expected.length, actual.length); for (int i = 0; i < actual.length; ++i) { @@ -57,62 +127,334 @@ public abstract class OverlayBaseTest extends AndroidTestCase { } } + public void testFrameworkBooleanOverlay() throws Throwable { + // config_annoy_dianne has the value: + // - true when no overlay exists (MODE_NO_OVERLAY) + // - false when a single overlay exists (MODE_SINGLE_OVERLAY) + // - false when multiple overlays exists (MODE_MULTIPLE_OVERLAYS) + final int resId = com.android.internal.R.bool.config_annoy_dianne; + assertResource(resId, true, false, false); + } + public void testBooleanOverlay() throws Throwable { - // config_automatic_brightness_available has overlay (default config) - final int resId = com.android.internal.R.bool.config_automatic_brightness_available; - assertResource(resId, false, true); + // usually_false has the value: + // - false when no overlay exists (MODE_NO_OVERLAY) + // - true when a single overlay exists (MODE_SINGLE_OVERLAY) + // - false when multiple overlays exists (MODE_MULTIPLE_OVERLAYS) + final int resId = R.bool.usually_false; + assertResource(resId, false, true, false); } public void testBoolean() throws Throwable { - // config_annoy_dianne has no overlay - final int resId = com.android.internal.R.bool.config_annoy_dianne; - assertResource(resId, true, true); + // always_true has no overlay + final int resId = R.bool.always_true; + assertResource(resId, true, true, true); + } + + public void testIntegerArrayOverlay() throws Throwable { + // fibonacci has values: + // - eight first values of Fibonacci sequence, when no overlay exists (MODE_NO_OVERLAY) + // - eight first values of Fibonacci sequence (reversed), for single and multiple overlays + // (MODE_SINGLE_OVERLAY, MODE_MULTIPLE_OVERLAYS) + final int resId = R.array.fibonacci; + assertResource(resId, + new int[]{1, 1, 2, 3, 5, 8, 13, 21}, + new int[]{21, 13, 8, 5, 3, 2, 1, 1}, + new int[]{21, 13, 8, 5, 3, 2, 1, 1}); + } + + public void testIntegerArray() throws Throwable { + // prime_numbers has no overlay + final int resId = R.array.prime_numbers; + final int[] expected = {2, 3, 5, 7, 11, 13, 17, 19}; + assertResource(resId, expected, expected, expected); + } + + public void testDrawable() throws Throwable { + // drawable-nodpi/drawable has overlay (default config) + final int resId = R.drawable.drawable; + int actual = calculateRawResourceChecksum(resId); + int expected = 0; + switch (mMode) { + case MODE_NO_OVERLAY: + expected = 0x00005665; + break; + case MODE_SINGLE_OVERLAY: + case MODE_MULTIPLE_OVERLAYS: + expected = 0x000051da; + break; + default: + fail("Unknown mode " + mMode); + } + assertEquals(expected, actual); + } + + public void testAppString() throws Throwable { + final int resId = R.string.str; + assertResource(resId, "none", "single", "multiple"); + } + + public void testApp2() throws Throwable { + final int resId = R.string.str2; // only in base package and first app overlay + assertResource(resId, "none", "single", "single"); } - public void testStringOverlay() throws Throwable { - // phoneTypeCar has an overlay (default config), which shouldn't shadow - // the Swedish translation - final int resId = com.android.internal.R.string.phoneTypeCar; + public void testAppXml() throws Throwable { + int expected = getExpected(0, 1, 2); + int actual = -1; + XmlResourceParser parser = mResources.getXml(R.xml.integer); + int type = parser.getEventType(); + while (type != XmlResourceParser.END_DOCUMENT && actual == -1) { + if (type == XmlResourceParser.START_TAG && "integer".equals(parser.getName())) { + AttributeSet as = Xml.asAttributeSet(parser); + actual = as.getAttributeIntValue(null, "value", -1); + } + type = parser.next(); + } + parser.close(); + assertEquals(expected, actual); + } + + public void testAppRaw() throws Throwable { + final int resId = R.raw.lorem_ipsum; + + InputStream input = null; + BufferedReader reader = null; + String actual = ""; + try { + input = mResources.openRawResource(resId); + reader = new BufferedReader(new InputStreamReader(input)); + actual = reader.readLine(); + } finally { + reader.close(); + input.close(); + } + + final String no = "Lorem ipsum dolor sit amet, consectetur adipisicing elit, " + + "sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. " + + "Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip " + + "ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit " + + "esse cillum dolore eu fugiat nulla pariatur. " + + "Excepteur sint occaecat cupidatat non proident, " + + "sunt in culpa qui officia deserunt mollit anim id est laborum."; + final String so = "Lorem ipsum: single overlay."; + final String mo = "Lorem ipsum: multiple overlays."; + + assertEquals(getExpected(no, so, mo), actual); + } + + /* + * testMatrix* tests + * + * The naming convention textMatrixABCDEF refers to in which packages and + * which configurations a resource is defined (1 if the resource is + * defined). If defined, a slot is always given the same value. + * + * SLOT PACKAGE CONFIGURATION VALUE + * A target package (default) 100 + * B target package -sv 200 + * C OverlayAppFirst (default) 300 + * D OverlayAppFirst -sv 400 + * E OverlayAppSecond (default) 500 + * F OverlayAppSecond -sv 600 + * + * Example: in testMatrix101110, the base package defines the + * R.integer.matrix101110 resource for the default configuration (value + * 100), OverlayAppFirst defines it for both default and Swedish + * configurations (values 300 and 400, respectively), and OverlayAppSecond + * defines it for the default configuration (value 500). If both overlays + * are loaded, the expected value after setting the language to Swedish is + * 400. + */ + public void testMatrix100000() throws Throwable { + final int resId = R.integer.matrix_100000; setLocale("sv_SE"); - assertResource(resId, "Bil", "Bil"); + assertResource(resId, 100, 100, 100); } - public void testStringSwedishOverlay() throws Throwable { - // phoneTypeWork has overlay (no default config, only for lang=sv) - final int resId = com.android.internal.R.string.phoneTypeWork; - setLocale("en_US"); - assertResource(resId, "Work", "Work"); + public void testMatrix100001() throws Throwable { + final int resId = R.integer.matrix_100001; setLocale("sv_SE"); - assertResource(resId, "Arbete", "Jobb"); + assertResource(resId, 100, 100, 600); } - public void testString() throws Throwable { - // phoneTypeHome has no overlay - final int resId = com.android.internal.R.string.phoneTypeHome; - setLocale("en_US"); - assertResource(resId, "Home", "Home"); + public void testMatrix100010() throws Throwable { + final int resId = R.integer.matrix_100010; setLocale("sv_SE"); - assertResource(resId, "Hem", "Hem"); + assertResource(resId, 100, 100, 500); } - public void testIntegerArrayOverlay() throws Throwable { - // config_scrollBarrierVibePattern has overlay (default config) - final int resId = com.android.internal.R.array.config_scrollBarrierVibePattern; - assertResource(resId, new int[]{0, 15, 10, 10}, new int[]{100, 200, 300}); + public void testMatrix100011() throws Throwable { + final int resId = R.integer.matrix_100011; + setLocale("sv_SE"); + assertResource(resId, 100, 100, 600); } - public void testIntegerArray() throws Throwable { - // config_virtualKeyVibePattern has no overlay - final int resId = com.android.internal.R.array.config_virtualKeyVibePattern; - final int[] expected = {0, 10, 20, 30}; - assertResource(resId, expected, expected); + public void testMatrix100100() throws Throwable { + final int resId = R.integer.matrix_100100; + setLocale("sv_SE"); + assertResource(resId, 100, 400, 400); } - public void testAsset() throws Throwable { - // drawable/default_background.jpg has overlay (default config) - final int resId = com.android.internal.R.drawable.default_wallpaper; - int actual = calculateRawResourceChecksum(resId); - int expected = mWithOverlay ? 0x000051da : 0x0014ebce; - assertEquals(expected, actual); + public void testMatrix100101() throws Throwable { + final int resId = R.integer.matrix_100101; + setLocale("sv_SE"); + assertResource(resId, 100, 400, 600); + } + + public void testMatrix100110() throws Throwable { + final int resId = R.integer.matrix_100110; + setLocale("sv_SE"); + assertResource(resId, 100, 400, 400); + } + + public void testMatrix100111() throws Throwable { + final int resId = R.integer.matrix_100111; + setLocale("sv_SE"); + assertResource(resId, 100, 400, 600); + } + + public void testMatrix101000() throws Throwable { + final int resId = R.integer.matrix_101000; + setLocale("sv_SE"); + assertResource(resId, 100, 300, 300); + } + + public void testMatrix101001() throws Throwable { + final int resId = R.integer.matrix_101001; + setLocale("sv_SE"); + assertResource(resId, 100, 300, 600); + } + + public void testMatrix101010() throws Throwable { + final int resId = R.integer.matrix_101010; + setLocale("sv_SE"); + assertResource(resId, 100, 300, 500); + } + + public void testMatrix101011() throws Throwable { + final int resId = R.integer.matrix_101011; + setLocale("sv_SE"); + assertResource(resId, 100, 300, 600); + } + + public void testMatrix101100() throws Throwable { + final int resId = R.integer.matrix_101100; + setLocale("sv_SE"); + assertResource(resId, 100, 400, 400); + } + + public void testMatrix101101() throws Throwable { + final int resId = R.integer.matrix_101101; + setLocale("sv_SE"); + assertResource(resId, 100, 400, 600); + } + + public void testMatrix101110() throws Throwable { + final int resId = R.integer.matrix_101110; + setLocale("sv_SE"); + assertResource(resId, 100, 400, 400); + } + + public void testMatrix101111() throws Throwable { + final int resId = R.integer.matrix_101111; + setLocale("sv_SE"); + assertResource(resId, 100, 400, 600); + } + + public void testMatrix110000() throws Throwable { + final int resId = R.integer.matrix_110000; + setLocale("sv_SE"); + assertResource(resId, 200, 200, 200); + } + + public void testMatrix110001() throws Throwable { + final int resId = R.integer.matrix_110001; + setLocale("sv_SE"); + assertResource(resId, 200, 200, 600); + } + + public void testMatrix110010() throws Throwable { + final int resId = R.integer.matrix_110010; + setLocale("sv_SE"); + assertResource(resId, 200, 200, 200); + } + + public void testMatrix110011() throws Throwable { + final int resId = R.integer.matrix_110011; + setLocale("sv_SE"); + assertResource(resId, 200, 200, 600); + } + + public void testMatrix110100() throws Throwable { + final int resId = R.integer.matrix_110100; + setLocale("sv_SE"); + assertResource(resId, 200, 400, 400); + } + + public void testMatrix110101() throws Throwable { + final int resId = R.integer.matrix_110101; + setLocale("sv_SE"); + assertResource(resId, 200, 400, 600); + } + + public void testMatrix110110() throws Throwable { + final int resId = R.integer.matrix_110110; + setLocale("sv_SE"); + assertResource(resId, 200, 400, 400); + } + + public void testMatrix110111() throws Throwable { + final int resId = R.integer.matrix_110111; + setLocale("sv_SE"); + assertResource(resId, 200, 400, 600); + } + + public void testMatrix111000() throws Throwable { + final int resId = R.integer.matrix_111000; + setLocale("sv_SE"); + assertResource(resId, 200, 200, 200); + } + + public void testMatrix111001() throws Throwable { + final int resId = R.integer.matrix_111001; + setLocale("sv_SE"); + assertResource(resId, 200, 200, 600); + } + + public void testMatrix111010() throws Throwable { + final int resId = R.integer.matrix_111010; + setLocale("sv_SE"); + assertResource(resId, 200, 200, 200); + } + + public void testMatrix111011() throws Throwable { + final int resId = R.integer.matrix_111011; + setLocale("sv_SE"); + assertResource(resId, 200, 200, 600); + } + + public void testMatrix111100() throws Throwable { + final int resId = R.integer.matrix_111100; + setLocale("sv_SE"); + assertResource(resId, 200, 400, 400); + } + + public void testMatrix111101() throws Throwable { + final int resId = R.integer.matrix_111101; + setLocale("sv_SE"); + assertResource(resId, 200, 400, 600); + } + + public void testMatrix111110() throws Throwable { + final int resId = R.integer.matrix_111110; + setLocale("sv_SE"); + assertResource(resId, 200, 400, 400); + } + + public void testMatrix111111() throws Throwable { + final int resId = R.integer.matrix_111111; + setLocale("sv_SE"); + assertResource(resId, 200, 400, 600); } } diff --git a/core/tests/overlaytests/OverlayTest/src/com/android/overlaytest/WithMultipleOverlaysTest.java b/core/tests/overlaytests/OverlayTest/src/com/android/overlaytest/WithMultipleOverlaysTest.java new file mode 100644 index 0000000..e104f5a --- /dev/null +++ b/core/tests/overlaytests/OverlayTest/src/com/android/overlaytest/WithMultipleOverlaysTest.java @@ -0,0 +1,7 @@ +package com.android.overlaytest; + +public class WithMultipleOverlaysTest extends OverlayBaseTest { + public WithMultipleOverlaysTest() { + mMode = MODE_MULTIPLE_OVERLAYS; + } +} diff --git a/core/tests/overlaytests/OverlayTest/src/com/android/overlaytest/WithOverlayTest.java b/core/tests/overlaytests/OverlayTest/src/com/android/overlaytest/WithOverlayTest.java index 1292d03..816a476 100644 --- a/core/tests/overlaytests/OverlayTest/src/com/android/overlaytest/WithOverlayTest.java +++ b/core/tests/overlaytests/OverlayTest/src/com/android/overlaytest/WithOverlayTest.java @@ -2,6 +2,6 @@ package com.android.overlaytest; public class WithOverlayTest extends OverlayBaseTest { public WithOverlayTest() { - mWithOverlay = true; + mMode = MODE_SINGLE_OVERLAY; } } diff --git a/core/tests/overlaytests/OverlayTest/src/com/android/overlaytest/WithoutOverlayTest.java b/core/tests/overlaytests/OverlayTest/src/com/android/overlaytest/WithoutOverlayTest.java index 630ff8f..318cccc 100644 --- a/core/tests/overlaytests/OverlayTest/src/com/android/overlaytest/WithoutOverlayTest.java +++ b/core/tests/overlaytests/OverlayTest/src/com/android/overlaytest/WithoutOverlayTest.java @@ -2,6 +2,6 @@ package com.android.overlaytest; public class WithoutOverlayTest extends OverlayBaseTest { public WithoutOverlayTest() { - mWithOverlay = false; + mMode = MODE_NO_OVERLAY; } } diff --git a/core/tests/overlaytests/OverlayTestOverlay/AndroidManifest.xml b/core/tests/overlaytests/OverlayTestOverlay/AndroidManifest.xml index bcbb0d1..f8b6c7b 100644 --- a/core/tests/overlaytests/OverlayTestOverlay/AndroidManifest.xml +++ b/core/tests/overlaytests/OverlayTestOverlay/AndroidManifest.xml @@ -2,5 +2,5 @@ package="com.android.overlaytest.overlay" android:versionCode="1" android:versionName="1.0"> - <overlay-package android:name="android"/> + <overlay android:targetPackage="android" android:priority="1"/> </manifest> diff --git a/core/tests/overlaytests/OverlayTestOverlay/res/values-sv/config.xml b/core/tests/overlaytests/OverlayTestOverlay/res/values-sv/config.xml deleted file mode 100644 index bc52367..0000000 --- a/core/tests/overlaytests/OverlayTestOverlay/res/values-sv/config.xml +++ /dev/null @@ -1,4 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<resources> - <string name="phoneTypeWork">Jobb</string> -</resources> diff --git a/core/tests/overlaytests/OverlayTestOverlay/res/values/config.xml b/core/tests/overlaytests/OverlayTestOverlay/res/values/config.xml index 794f475..c1e3de1 100644 --- a/core/tests/overlaytests/OverlayTestOverlay/res/values/config.xml +++ b/core/tests/overlaytests/OverlayTestOverlay/res/values/config.xml @@ -1,13 +1,4 @@ <?xml version="1.0" encoding="utf-8"?> <resources> - <bool name="config_automatic_brightness_available">true</bool> - <string name="phoneTypeCar">Automobile</string> - <integer-array name="config_scrollBarrierVibePattern"> - <item>100</item> - <item>200</item> - <item>300</item> - </integer-array> - <!-- The following integer does not exist in the original package. Idmap - generation should therefore ignore it. --> - <integer name="integer_not_in_original_package">0</integer> + <bool name="config_annoy_dianne">false</bool> </resources> diff --git a/core/tests/overlaytests/README b/core/tests/overlaytests/README deleted file mode 100644 index 4b3e6f2..0000000 --- a/core/tests/overlaytests/README +++ /dev/null @@ -1,15 +0,0 @@ -Unit tests for runtime resource overlay -======================================= - -As of this writing, runtime resource overlay is only triggered for -/system/framework/framework-res.apk. Because of this, installation of -overlay packages require the Android platform be rebooted. However, the -regular unit tests (triggered via development/testrunner/runtest.py) -cannot handle reboots. As a workaround, this directory contains a shell -script which will trigger the tests in a non-standard way. - -Once runtime resource overlay may be applied to applications, the tests -in this directory should be moved to core/tests/coretests. Also, by -applying runtime resource overlay to a dedicated test application, the -test cases would not need to assume default values for non-overlaid -resources. diff --git a/core/tests/overlaytests/runtests.sh b/core/tests/overlaytests/runtests.sh deleted file mode 100755 index 0a721ad40..0000000 --- a/core/tests/overlaytests/runtests.sh +++ /dev/null @@ -1,129 +0,0 @@ -#!/bin/bash - -adb="adb" -if [[ $# -gt 0 ]]; then - adb="adb $*" # for setting -e, -d or -s <serial> -fi - -function atexit() -{ - local retval=$? - - if [[ $retval -eq 0 ]]; then - rm $log - else - echo "There were errors, please check log at $log" - fi -} - -log=$(mktemp) -trap "atexit" EXIT - -function compile_module() -{ - local android_mk="$1" - - echo "Compiling .${android_mk:${#PWD}}" - ONE_SHOT_MAKEFILE="$android_mk" make -C "../../../../../" files | tee -a $log - if [[ ${PIPESTATUS[0]} -ne 0 ]]; then - exit 1 - fi -} - -function wait_for_boot_completed() -{ - echo "Rebooting device" - $adb wait-for-device logcat -c - $adb wait-for-device logcat | grep -m 1 -e 'PowerManagerService.*bootCompleted' >/dev/null -} - -function mkdir_if_needed() -{ - local path="$1" - - if [[ "${path:0:1}" != "/" ]]; then - echo "mkdir_if_needed: error: path '$path' does not begin with /" | tee -a $log - exit 1 - fi - - local basename=$(basename "$path") - local dirname=$(dirname "$path") - local t=$($adb shell ls -l $dirname | tr -d '\r' | grep -e "${basename}$" | grep -oe '^.') - - case "$t" in - d) # File exists, and is a directory ... - # do nothing - ;; - l) # ... (or symbolic link possibly to a directory). - # do nothing - ;; - "") # File does not exist. - mkdir_if_needed "$dirname" - $adb shell mkdir "$path" - ;; - *) # File exists, but is not a directory. - echo "mkdir_if_needed: file '$path' exists, but is not a directory" | tee -a $log - exit 1 - ;; - esac -} - -function disable_overlay() -{ - echo "Disabling overlay" - $adb shell rm /vendor/overlay/framework/framework-res.apk - $adb shell rm /data/resource-cache/vendor@overlay@framework@framework-res.apk@idmap -} - -function enable_overlay() -{ - echo "Enabling overlay" - mkdir_if_needed "/system/vendor" - mkdir_if_needed "/vendor/overlay/framework" - $adb shell ln -s /data/app/com.android.overlaytest.overlay.apk /vendor/overlay/framework/framework-res.apk -} - -function instrument() -{ - local class="$1" - - echo "Instrumenting $class" - $adb shell am instrument -w -e class $class com.android.overlaytest/android.test.InstrumentationTestRunner | tee -a $log -} - -function remount() -{ - echo "Remounting file system writable" - $adb remount | tee -a $log -} - -function sync() -{ - echo "Syncing to device" - $adb sync data | tee -a $log -} - -# some commands require write access, remount once and for all -remount - -# build and sync -compile_module "$PWD/OverlayTest/Android.mk" -compile_module "$PWD/OverlayTestOverlay/Android.mk" -sync - -# instrument test (without overlay) -$adb shell stop -disable_overlay -$adb shell start -wait_for_boot_completed -instrument "com.android.overlaytest.WithoutOverlayTest" - -# instrument test (with overlay) -$adb shell stop -enable_overlay -$adb shell start -wait_for_boot_completed -instrument "com.android.overlaytest.WithOverlayTest" - -# cleanup -exit $(grep -c -e '^FAILURES' $log) diff --git a/core/tests/overlaytests/testrunner.py b/core/tests/overlaytests/testrunner.py new file mode 100755 index 0000000..4f94373 --- /dev/null +++ b/core/tests/overlaytests/testrunner.py @@ -0,0 +1,679 @@ +#!/usr/bin/python +import hashlib +import optparse +import os +import re +import shlex +import subprocess +import sys +import threading +import time + +TASK_COMPILATION = 'compile' +TASK_DISABLE_OVERLAYS = 'disable overlays' +TASK_ENABLE_MULTIPLE_OVERLAYS = 'enable multiple overlays' +TASK_ENABLE_SINGLE_OVERLAY = 'enable single overlay' +TASK_FILE_EXISTS_TEST = 'test (file exists)' +TASK_GREP_IDMAP_TEST = 'test (grep idmap)' +TASK_MD5_TEST = 'test (md5)' +TASK_IDMAP_PATH = 'idmap --path' +TASK_IDMAP_SCAN = 'idmap --scan' +TASK_INSTRUMENTATION = 'instrumentation' +TASK_INSTRUMENTATION_TEST = 'test (instrumentation)' +TASK_MKDIR = 'mkdir' +TASK_PUSH = 'push' +TASK_ROOT = 'root' +TASK_REMOUNT = 'remount' +TASK_RM = 'rm' +TASK_SETUP_IDMAP_PATH = 'setup idmap --path' +TASK_SETUP_IDMAP_SCAN = 'setup idmap --scan' +TASK_START = 'start' +TASK_STOP = 'stop' + +adb = 'adb' + +def _adb_shell(cmd): + argv = shlex.split(adb + " shell '" + cmd + "; echo $?'") + proc = subprocess.Popen(argv, bufsize=1, stdout=subprocess.PIPE, stderr=subprocess.PIPE) + (stdout, stderr) = proc.communicate() + (stdout, stderr) = (stdout.replace('\r', ''), stderr.replace('\r', '')) + tmp = stdout.rsplit('\n', 2) + if len(tmp) == 2: + stdout == '' + returncode = int(tmp[0]) + else: + stdout = tmp[0] + '\n' + returncode = int(tmp[1]) + return returncode, stdout, stderr + +class VerbosePrinter: + class Ticker(threading.Thread): + def _print(self): + s = '\r' + self.text + '[' + '.' * self.i + ' ' * (4 - self.i) + ']' + sys.stdout.write(s) + sys.stdout.flush() + self.i = (self.i + 1) % 5 + + def __init__(self, cond_var, text): + threading.Thread.__init__(self) + self.text = text + self.setDaemon(True) + self.cond_var = cond_var + self.running = False + self.i = 0 + self._print() + self.running = True + + def run(self): + self.cond_var.acquire() + while True: + self.cond_var.wait(0.25) + running = self.running + if not running: + break + self._print() + self.cond_var.release() + + def stop(self): + self.cond_var.acquire() + self.running = False + self.cond_var.notify_all() + self.cond_var.release() + + def _start_ticker(self): + self.ticker = VerbosePrinter.Ticker(self.cond_var, self.text) + self.ticker.start() + + def _stop_ticker(self): + self.ticker.stop() + self.ticker.join() + self.ticker = None + + def _format_begin(self, type, name): + N = self.width - len(type) - len(' [ ] ') + fmt = '%%s %%-%ds ' % N + return fmt % (type, name) + + def __init__(self, use_color): + self.cond_var = threading.Condition() + self.ticker = None + if use_color: + self.color_RED = '\033[1;31m' + self.color_red = '\033[0;31m' + self.color_reset = '\033[0;37m' + else: + self.color_RED = '' + self.color_red = '' + self.color_reset = '' + + argv = shlex.split('stty size') # get terminal width + proc = subprocess.Popen(argv, stdout=subprocess.PIPE, stderr=subprocess.PIPE) + (stdout, stderr) = proc.communicate() + if proc.returncode == 0: + (h, w) = stdout.split() + self.width = int(w) + else: + self.width = 72 # conservative guesstimate + + def begin(self, type, name): + self.text = self._format_begin(type, name) + sys.stdout.write(self.text + '[ ]') + sys.stdout.flush() + self._start_ticker() + + def end_pass(self, type, name): + self._stop_ticker() + sys.stdout.write('\r' + self.text + '[ OK ]\n') + sys.stdout.flush() + + def end_fail(self, type, name, msg): + self._stop_ticker() + sys.stdout.write('\r' + self.color_RED + self.text + '[FAIL]\n') + sys.stdout.write(self.color_red) + sys.stdout.write(msg) + sys.stdout.write(self.color_reset) + sys.stdout.flush() + +class QuietPrinter: + def begin(self, type, name): + pass + + def end_pass(self, type, name): + sys.stdout.write('PASS ' + type + ' ' + name + '\n') + sys.stdout.flush() + + def end_fail(self, type, name, msg): + sys.stdout.write('FAIL ' + type + ' ' + name + '\n') + sys.stdout.flush() + +class CompilationTask: + def __init__(self, makefile): + self.makefile = makefile + + def get_type(self): + return TASK_COMPILATION + + def get_name(self): + return self.makefile + + def execute(self): + os.putenv('ONE_SHOT_MAKEFILE', os.getcwd() + "/" + self.makefile) + argv = shlex.split('make -C "../../../../../" files') + proc = subprocess.Popen(argv, stdout=subprocess.PIPE, stderr=subprocess.PIPE) + (stdout, stderr) = proc.communicate() + return proc.returncode, stdout, stderr + +class InstrumentationTask: + def __init__(self, instrumentation_class): + self.instrumentation_class = instrumentation_class + + def get_type(self): + return TASK_INSTRUMENTATION + + def get_name(self): + return self.instrumentation_class + + def execute(self): + return _adb_shell('am instrument -r -w -e class %s com.android.overlaytest/android.test.InstrumentationTestRunner' % self.instrumentation_class) + +class PushTask: + def __init__(self, src, dest): + self.src = src + self.dest = dest + + def get_type(self): + return TASK_PUSH + + def get_name(self): + return "%s -> %s" % (self.src, self.dest) + + def execute(self): + src = os.getenv('OUT') + "/" + self.src + argv = shlex.split(adb + ' push %s %s' % (src, self.dest)) + proc = subprocess.Popen(argv, stdout=subprocess.PIPE, stderr=subprocess.PIPE) + (stdout, stderr) = proc.communicate() + return proc.returncode, stdout, stderr + +class MkdirTask: + def __init__(self, path): + self.path = path + + def get_type(self): + return TASK_MKDIR + + def get_name(self): + return self.path + + def execute(self): + return _adb_shell('mkdir -p %s' % self.path) + +class RmTask: + def __init__(self, path): + self.path = path + + def get_type(self): + return TASK_RM + + def get_name(self): + return self.path + + def execute(self): + returncode, stdout, stderr = _adb_shell('ls %s' % self.path) + if returncode != 0 and stdout.endswith(': No such file or directory\n'): + return 0, "", "" + return _adb_shell('rm -r %s' % self.path) + +class IdmapPathTask: + def __init__(self, path_target_apk, path_overlay_apk, path_idmap): + self.path_target_apk = path_target_apk + self.path_overlay_apk = path_overlay_apk + self.path_idmap = path_idmap + + def get_type(self): + return TASK_IDMAP_PATH + + def get_name(self): + return self.path_idmap + + def execute(self): + return _adb_shell('su system idmap --path "%s" "%s" "%s"' % (self.path_target_apk, self.path_overlay_apk, self.path_idmap)) + +class IdmapScanTask: + def __init__(self, overlay_dir, target_pkg_name, target_pkg, idmap_dir, symlink_dir): + self.overlay_dir = overlay_dir + self.target_pkg_name = target_pkg_name + self.target_pkg = target_pkg + self.idmap_dir = idmap_dir + self.symlink_dir = symlink_dir + + def get_type(self): + return TASK_IDMAP_SCAN + + def get_name(self): + return self.target_pkg_name + + def execute(self): + return _adb_shell('su system idmap --scan "%s" "%s" "%s" "%s"' % (self.overlay_dir, self.target_pkg_name, self.target_pkg, self.idmap_dir)) + +class FileExistsTest: + def __init__(self, path): + self.path = path + + def get_type(self): + return TASK_FILE_EXISTS_TEST + + def get_name(self): + return self.path + + def execute(self): + return _adb_shell('ls %s' % self.path) + +class GrepIdmapTest: + def __init__(self, path_idmap, pattern, expected_n): + self.path_idmap = path_idmap + self.pattern = pattern + self.expected_n = expected_n + + def get_type(self): + return TASK_GREP_IDMAP_TEST + + def get_name(self): + return self.pattern + + def execute(self): + returncode, stdout, stderr = _adb_shell('idmap --inspect %s' % self.path_idmap) + if returncode != 0: + return returncode, stdout, stderr + all_matches = re.findall('\s' + self.pattern + '$', stdout, flags=re.MULTILINE) + if len(all_matches) != self.expected_n: + return 1, 'pattern=%s idmap=%s expected=%d found=%d\n' % (self.pattern, self.path_idmap, self.expected_n, len(all_matches)), '' + return 0, "", "" + +class Md5Test: + def __init__(self, path, expected_content): + self.path = path + self.expected_md5 = hashlib.md5(expected_content).hexdigest() + + def get_type(self): + return TASK_MD5_TEST + + def get_name(self): + return self.path + + def execute(self): + returncode, stdout, stderr = _adb_shell('md5 %s' % self.path) + if returncode != 0: + return returncode, stdout, stderr + actual_md5 = stdout.split()[0] + if actual_md5 != self.expected_md5: + return 1, 'expected %s, got %s\n' % (self.expected_md5, actual_md5), '' + return 0, "", "" + +class StartTask: + def get_type(self): + return TASK_START + + def get_name(self): + return "" + + def execute(self): + (returncode, stdout, stderr) = _adb_shell('start') + if returncode != 0: + return returncode, stdout, stderr + + while True: + (returncode, stdout, stderr) = _adb_shell('getprop dev.bootcomplete') + if returncode != 0: + return returncode, stdout, stderr + if stdout.strip() == "1": + break + time.sleep(0.5) + + return 0, "", "" + +class StopTask: + def get_type(self): + return TASK_STOP + + def get_name(self): + return "" + + def execute(self): + (returncode, stdout, stderr) = _adb_shell('stop') + if returncode != 0: + return returncode, stdout, stderr + return _adb_shell('setprop dev.bootcomplete 0') + +class RootTask: + def get_type(self): + return TASK_ROOT + + def get_name(self): + return "" + + def execute(self): + (returncode, stdout, stderr) = _adb_shell('getprop service.adb.root 0') + if returncode != 0: + return returncode, stdout, stderr + if stdout.strip() == '1': # already root + return 0, "", "" + + argv = shlex.split(adb + ' root') + proc = subprocess.Popen(argv, stdout=subprocess.PIPE, stderr=subprocess.PIPE) + (stdout, stderr) = proc.communicate() + if proc.returncode != 0: + return proc.returncode, stdout, stderr + + argv = shlex.split(adb + ' wait-for-device') + proc = subprocess.Popen(argv, stdout=subprocess.PIPE, stderr=subprocess.PIPE) + (stdout, stderr) = proc.communicate() + return proc.returncode, stdout, stderr + +class RemountTask: + def get_type(self): + return TASK_REMOUNT + + def get_name(self): + return "" + + def execute(self): + argv = shlex.split(adb + ' remount') + proc = subprocess.Popen(argv, stdout=subprocess.PIPE, stderr=subprocess.PIPE) + (stdout, stderr) = proc.communicate() + # adb remount returns 0 even if the operation failed, so check stdout + if stdout.startswith('remount failed:'): + return 1, stdout, stderr + return proc.returncode, stdout, stderr + +class CompoundTask: + def __init__(self, type, tasks): + self.type = type + self.tasks = tasks + + def get_type(self): + return self.type + + def get_name(self): + return "" + + def execute(self): + for t in self.tasks: + (returncode, stdout, stderr) = t.execute() + if returncode != 0: + return returncode, stdout, stderr + return 0, "", "" + +def _create_disable_overlays_task(): + tasks = [ + RmTask("/vendor/overlay/framework_a.apk"), + RmTask("/vendor/overlay/framework_b.apk"), + RmTask("/data/resource-cache/vendor@overlay@framework_a.apk@idmap"), + RmTask("/data/resource-cache/vendor@overlay@framework_b.apk@idmap"), + RmTask("/vendor/overlay/app_a.apk"), + RmTask("/vendor/overlay/app_b.apk"), + RmTask("/data/resource-cache/vendor@overlay@app_a.apk@idmap"), + RmTask("/data/resource-cache/vendor@overlay@app_b.apk@idmap"), + ] + return CompoundTask(TASK_DISABLE_OVERLAYS, tasks) + +def _create_enable_single_overlay_task(): + tasks = [ + _create_disable_overlays_task(), + MkdirTask('/system/vendor'), + MkdirTask('/vendor/overlay'), + PushTask('/data/app/com.android.overlaytest.overlay.apk', '/vendor/overlay/framework_a.apk'), + PushTask('/data/app/com.android.overlaytest.first_app_overlay.apk', '/vendor/overlay/app_a.apk'), + ] + return CompoundTask(TASK_ENABLE_SINGLE_OVERLAY, tasks) + +def _create_enable_multiple_overlays_task(): + tasks = [ + _create_disable_overlays_task(), + MkdirTask('/system/vendor'), + MkdirTask('/vendor/overlay'), + + PushTask('/data/app/com.android.overlaytest.overlay.apk', '/vendor/overlay/framework_b.apk'), + PushTask('/data/app/com.android.overlaytest.first_app_overlay.apk', '/vendor/overlay/app_a.apk'), + PushTask('/data/app/com.android.overlaytest.second_app_overlay.apk', '/vendor/overlay/app_b.apk'), + ] + return CompoundTask(TASK_ENABLE_MULTIPLE_OVERLAYS, tasks) + +def _create_setup_idmap_path_task(idmaps, symlinks): + tasks = [ + _create_enable_single_overlay_task(), + RmTask(symlinks), + RmTask(idmaps), + MkdirTask(idmaps), + MkdirTask(symlinks), + ] + return CompoundTask(TASK_SETUP_IDMAP_PATH, tasks) + +def _create_setup_idmap_scan_task(idmaps, symlinks): + tasks = [ + _create_enable_single_overlay_task(), + RmTask(symlinks), + RmTask(idmaps), + MkdirTask(idmaps), + MkdirTask(symlinks), + _create_enable_multiple_overlays_task(), + ] + return CompoundTask(TASK_SETUP_IDMAP_SCAN, tasks) + +def _handle_instrumentation_task_output(stdout, printer): + regex_status_code = re.compile(r'^INSTRUMENTATION_STATUS_CODE: -?(\d+)') + regex_name = re.compile(r'^INSTRUMENTATION_STATUS: test=(.*)') + regex_begin_stack = re.compile(r'^INSTRUMENTATION_STATUS: stack=(.*)') + regex_end_stack = re.compile(r'^$') + + failed_tests = 0 + current_test = None + current_stack = [] + mode_stack = False + for line in stdout.split("\n"): + line = line.rstrip() # strip \r from adb output + m = regex_status_code.match(line) + if m: + c = int(m.group(1)) + if c == 1: + printer.begin(TASK_INSTRUMENTATION_TEST, current_test) + elif c == 0: + printer.end_pass(TASK_INSTRUMENTATION_TEST, current_test) + else: + failed_tests += 1 + current_stack.append("\n") + msg = "\n".join(current_stack) + printer.end_fail(TASK_INSTRUMENTATION_TEST, current_test, msg.rstrip() + '\n') + continue + + m = regex_name.match(line) + if m: + current_test = m.group(1) + continue + + m = regex_begin_stack.match(line) + if m: + mode_stack = True + current_stack = [] + current_stack.append(" " + m.group(1)) + continue + + m = regex_end_stack.match(line) + if m: + mode_stack = False + continue + + if mode_stack: + current_stack.append(" " + line.strip()) + + return failed_tests + +def _set_adb_device(option, opt, value, parser): + global adb + if opt == '-d' or opt == '--device': + adb = 'adb -d' + if opt == '-e' or opt == '--emulator': + adb = 'adb -e' + if opt == '-s' or opt == '--serial': + adb = 'adb -s ' + value + +def _create_opt_parser(): + parser = optparse.OptionParser() + parser.add_option('-d', '--device', action='callback', callback=_set_adb_device, + help='pass -d to adb') + parser.add_option('-e', '--emulator', action='callback', callback=_set_adb_device, + help='pass -e to adb') + parser.add_option('-s', '--serial', type="str", action='callback', callback=_set_adb_device, + help='pass -s <serical> to adb') + parser.add_option('-C', '--no-color', action='store_false', + dest='use_color', default=True, + help='disable color escape sequences in output') + parser.add_option('-q', '--quiet', action='store_true', + dest='quiet_mode', default=False, + help='quiet mode, output only results') + parser.add_option('-b', '--no-build', action='store_false', + dest='do_build', default=True, + help='do not rebuild test projects') + parser.add_option('-k', '--continue', action='store_true', + dest='do_continue', default=False, + help='do not rebuild test projects') + parser.add_option('-i', '--test-idmap', action='store_true', + dest='test_idmap', default=False, + help='run tests for single overlay') + parser.add_option('-0', '--test-no-overlay', action='store_true', + dest='test_no_overlay', default=False, + help='run tests without any overlay') + parser.add_option('-1', '--test-single-overlay', action='store_true', + dest='test_single_overlay', default=False, + help='run tests for single overlay') + parser.add_option('-2', '--test-multiple-overlays', action='store_true', + dest='test_multiple_overlays', default=False, + help='run tests for multiple overlays') + return parser + +if __name__ == '__main__': + opt_parser = _create_opt_parser() + opts, args = opt_parser.parse_args(sys.argv[1:]) + if not opts.test_idmap and not opts.test_no_overlay and not opts.test_single_overlay and not opts.test_multiple_overlays: + opts.test_idmap = True + opts.test_no_overlay = True + opts.test_single_overlay = True + opts.test_multiple_overlays = True + if len(args) > 0: + opt_parser.error("unexpected arguments: %s" % " ".join(args)) + # will never reach this: opt_parser.error will call sys.exit + + if opts.quiet_mode: + printer = QuietPrinter() + else: + printer = VerbosePrinter(opts.use_color) + tasks = [] + + # must be in the same directory as this script for compilation tasks to work + script = sys.argv[0] + dirname = os.path.dirname(script) + wd = os.path.realpath(dirname) + os.chdir(wd) + + # build test cases + if opts.do_build: + tasks.append(CompilationTask('OverlayTest/Android.mk')) + tasks.append(CompilationTask('OverlayTestOverlay/Android.mk')) + tasks.append(CompilationTask('OverlayAppFirst/Android.mk')) + tasks.append(CompilationTask('OverlayAppSecond/Android.mk')) + + # remount filesystem, install test project + tasks.append(RootTask()) + tasks.append(RemountTask()) + tasks.append(PushTask('/system/app/OverlayTest.apk', '/system/app/OverlayTest.apk')) + + # test idmap + if opts.test_idmap: + idmaps='/data/local/tmp/idmaps' + symlinks='/data/local/tmp/symlinks' + + # idmap --path + tasks.append(StopTask()) + tasks.append(_create_setup_idmap_path_task(idmaps, symlinks)) + tasks.append(StartTask()) + tasks.append(IdmapPathTask('/vendor/overlay/framework_a.apk', '/system/framework/framework-res.apk', idmaps + '/a.idmap')) + tasks.append(FileExistsTest(idmaps + '/a.idmap')) + tasks.append(GrepIdmapTest(idmaps + '/a.idmap', 'bool/config_annoy_dianne', 1)) + + # idmap --scan + idmap = idmaps + '/vendor@overlay@framework_b.apk@idmap' + tasks.append(StopTask()) + tasks.append(_create_setup_idmap_scan_task(idmaps, symlinks)) + tasks.append(StartTask()) + tasks.append(IdmapScanTask('/vendor/overlay', 'android', '/system/framework/framework-res.apk', idmaps, symlinks)) + tasks.append(FileExistsTest(idmap)) + tasks.append(GrepIdmapTest(idmap, 'bool/config_annoy_dianne', 1)) + + # overlays.list + overlays_list_path = '/data/resource-cache/overlays.list' + expected_content = '''\ +/vendor/overlay/framework_b.apk /data/resource-cache/vendor@overlay@framework_b.apk@idmap +''' + tasks.append(FileExistsTest(overlays_list_path)) + tasks.append(Md5Test(overlays_list_path, expected_content)) + + # idmap cleanup + tasks.append(RmTask(symlinks)) + tasks.append(RmTask(idmaps)) + + # test no overlay + if opts.test_no_overlay: + tasks.append(StopTask()) + tasks.append(_create_disable_overlays_task()) + tasks.append(StartTask()) + tasks.append(InstrumentationTask('com.android.overlaytest.WithoutOverlayTest')) + + # test single overlay + if opts.test_single_overlay: + tasks.append(StopTask()) + tasks.append(_create_enable_single_overlay_task()) + tasks.append(StartTask()) + tasks.append(InstrumentationTask('com.android.overlaytest.WithOverlayTest')) + + # test multiple overlays + if opts.test_multiple_overlays: + tasks.append(StopTask()) + tasks.append(_create_enable_multiple_overlays_task()) + tasks.append(StartTask()) + tasks.append(InstrumentationTask('com.android.overlaytest.WithMultipleOverlaysTest')) + + ignored_errors = 0 + for t in tasks: + type = t.get_type() + name = t.get_name() + if type == TASK_INSTRUMENTATION: + # InstrumentationTask will run several tests, but we want it + # to appear as if each test was run individually. Calling + # "am instrument" with a single test method is prohibitively + # expensive, so let's instead post-process the output to + # emulate individual calls. + retcode, stdout, stderr = t.execute() + if retcode != 0: + printer.begin(TASK_INSTRUMENTATION, name) + printer.end_fail(TASK_INSTRUMENTATION, name, stderr) + sys.exit(retcode) + retcode = _handle_instrumentation_task_output(stdout, printer) + if retcode != 0: + if not opts.do_continue: + sys.exit(retcode) + else: + ignored_errors += retcode + else: + printer.begin(type, name) + retcode, stdout, stderr = t.execute() + if retcode == 0: + printer.end_pass(type, name) + if retcode != 0: + if len(stderr) == 0: + # hope for output from stdout instead (true for eg adb shell rm) + stderr = stdout + printer.end_fail(type, name, stderr) + if not opts.do_continue: + sys.exit(retcode) + else: + ignored_errors += retcode + sys.exit(ignored_errors) diff --git a/docs/html/guide/topics/renderscript/compute.jd b/docs/html/guide/topics/renderscript/compute.jd index c62510b..297a2dc 100644 --- a/docs/html/guide/topics/renderscript/compute.jd +++ b/docs/html/guide/topics/renderscript/compute.jd @@ -56,7 +56,9 @@ contain:</p> RenderScript kernel language used in this script. Currently, 1 is the only valid value.</li> <li>A pragma declaration (<code>#pragma rs java_package_name(com.example.app)</code>) that -declares the package name of the Java classes reflected from this script.</li> +declares the package name of the Java classes reflected from this script. +Note that your .rs file must be part of your application package, and not in a +library project.</li> <li>Some number of invokable functions. An invokable function is a single-threaded RenderScript function that you can call from your Java code with arbitrary arguments. These are often useful for @@ -308,4 +310,4 @@ function launches as necessary.</li> <li><strong>Tear down the RenderScript context.</strong> The RenderScript context can be destroyed with {@link android.renderscript.RenderScript#destroy} or by allowing the RenderScript context object to be garbage collected. This will cause any further use of any object belonging to that -context to throw an exception.</li> </ol>
\ No newline at end of file +context to throw an exception.</li> </ol> diff --git a/graphics/java/android/graphics/pdf/PdfDocument.java b/graphics/java/android/graphics/pdf/PdfDocument.java index 29d14a2..f5b07c1 100644 --- a/graphics/java/android/graphics/pdf/PdfDocument.java +++ b/graphics/java/android/graphics/pdf/PdfDocument.java @@ -82,7 +82,7 @@ public class PdfDocument { private final List<PageInfo> mPages = new ArrayList<PageInfo>(); - private int mNativeDocument; + private long mNativeDocument; private Page mCurrentPage; @@ -235,20 +235,20 @@ public class PdfDocument { } } - private native int nativeCreateDocument(); + private native long nativeCreateDocument(); - private native void nativeClose(int document); + private native void nativeClose(long nativeDocument); - private native void nativeFinishPage(int document); + private native void nativeFinishPage(long nativeDocument); - private native void nativeWriteTo(int document, OutputStream out, byte[] chunk); + private native void nativeWriteTo(long nativeDocument, OutputStream out, byte[] chunk); - private static native int nativeStartPage(int documentPtr, int pageWidth, int pageHeight, + private static native long nativeStartPage(long nativeDocument, int pageWidth, int pageHeight, int contentLeft, int contentTop, int contentRight, int contentBottom); private final class PdfCanvas extends Canvas { - public PdfCanvas(int nativeCanvas) { + public PdfCanvas(long nativeCanvas) { super(nativeCanvas); } diff --git a/graphics/jni/android_renderscript_RenderScript.cpp b/graphics/jni/android_renderscript_RenderScript.cpp deleted file mode 100644 index afba1a6..0000000 --- a/graphics/jni/android_renderscript_RenderScript.cpp +++ /dev/null @@ -1,1726 +0,0 @@ -/* - * Copyright (C) 2011-2012 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#define LOG_TAG "libRS_jni" - -#include <stdlib.h> -#include <stdio.h> -#include <fcntl.h> -#include <unistd.h> -#include <math.h> -#include <utils/misc.h> - -#include <core/SkBitmap.h> -#include <core/SkPixelRef.h> -#include <core/SkStream.h> -#include <core/SkTemplates.h> - -#include <androidfw/Asset.h> -#include <androidfw/AssetManager.h> -#include <androidfw/ResourceTypes.h> - -#include "jni.h" -#include "JNIHelp.h" -#include "android_runtime/AndroidRuntime.h" -#include "android_runtime/android_view_Surface.h" -#include "android_runtime/android_util_AssetManager.h" - -#include <rs.h> -#include <rsEnv.h> -#include <gui/Surface.h> -#include <gui/GLConsumer.h> -#include <gui/Surface.h> -#include <android_runtime/android_graphics_SurfaceTexture.h> - -//#define LOG_API ALOGE -#define LOG_API(...) - -using namespace android; - -class AutoJavaStringToUTF8 { -public: - AutoJavaStringToUTF8(JNIEnv* env, jstring str) : fEnv(env), fJStr(str) { - fCStr = env->GetStringUTFChars(str, NULL); - fLength = env->GetStringUTFLength(str); - } - ~AutoJavaStringToUTF8() { - fEnv->ReleaseStringUTFChars(fJStr, fCStr); - } - const char* c_str() const { return fCStr; } - jsize length() const { return fLength; } - -private: - JNIEnv* fEnv; - jstring fJStr; - const char* fCStr; - jsize fLength; -}; - -class AutoJavaStringArrayToUTF8 { -public: - AutoJavaStringArrayToUTF8(JNIEnv* env, jobjectArray strings, jsize stringsLength) - : mEnv(env), mStrings(strings), mStringsLength(stringsLength) { - mCStrings = NULL; - mSizeArray = NULL; - if (stringsLength > 0) { - mCStrings = (const char **)calloc(stringsLength, sizeof(char *)); - mSizeArray = (size_t*)calloc(stringsLength, sizeof(size_t)); - for (jsize ct = 0; ct < stringsLength; ct ++) { - jstring s = (jstring)mEnv->GetObjectArrayElement(mStrings, ct); - mCStrings[ct] = mEnv->GetStringUTFChars(s, NULL); - mSizeArray[ct] = mEnv->GetStringUTFLength(s); - } - } - } - ~AutoJavaStringArrayToUTF8() { - for (jsize ct=0; ct < mStringsLength; ct++) { - jstring s = (jstring)mEnv->GetObjectArrayElement(mStrings, ct); - mEnv->ReleaseStringUTFChars(s, mCStrings[ct]); - } - free(mCStrings); - free(mSizeArray); - } - const char **c_str() const { return mCStrings; } - size_t *c_str_len() const { return mSizeArray; } - jsize length() const { return mStringsLength; } - -private: - JNIEnv *mEnv; - jobjectArray mStrings; - const char **mCStrings; - size_t *mSizeArray; - jsize mStringsLength; -}; - -// --------------------------------------------------------------------------- - -static jfieldID gContextId = 0; -static jfieldID gNativeBitmapID = 0; -static jfieldID gTypeNativeCache = 0; - -static void _nInit(JNIEnv *_env, jclass _this) -{ - gContextId = _env->GetFieldID(_this, "mContext", "I"); - - jclass bitmapClass = _env->FindClass("android/graphics/Bitmap"); - gNativeBitmapID = _env->GetFieldID(bitmapClass, "mNativeBitmap", "J"); -} - -// --------------------------------------------------------------------------- - -static void -nContextFinish(JNIEnv *_env, jobject _this, RsContext con) -{ - LOG_API("nContextFinish, con(%p)", con); - rsContextFinish(con); -} - -static void -nAssignName(JNIEnv *_env, jobject _this, RsContext con, jint obj, jbyteArray str) -{ - LOG_API("nAssignName, con(%p), obj(%p)", con, (void *)obj); - jint len = _env->GetArrayLength(str); - jbyte * cptr = (jbyte *) _env->GetPrimitiveArrayCritical(str, 0); - rsAssignName(con, (void *)obj, (const char *)cptr, len); - _env->ReleasePrimitiveArrayCritical(str, cptr, JNI_ABORT); -} - -static jstring -nGetName(JNIEnv *_env, jobject _this, RsContext con, jint obj) -{ - LOG_API("nGetName, con(%p), obj(%p)", con, (void *)obj); - const char *name = NULL; - rsaGetName(con, (void *)obj, &name); - if(name == NULL || strlen(name) == 0) { - return NULL; - } - return _env->NewStringUTF(name); -} - -static void -nObjDestroy(JNIEnv *_env, jobject _this, RsContext con, jint obj) -{ - LOG_API("nObjDestroy, con(%p) obj(%p)", con, (void *)obj); - rsObjDestroy(con, (void *)obj); -} - -// --------------------------------------------------------------------------- - -static jint -nDeviceCreate(JNIEnv *_env, jobject _this) -{ - LOG_API("nDeviceCreate"); - return (jint)rsDeviceCreate(); -} - -static void -nDeviceDestroy(JNIEnv *_env, jobject _this, jint dev) -{ - LOG_API("nDeviceDestroy"); - return rsDeviceDestroy((RsDevice)dev); -} - -static void -nDeviceSetConfig(JNIEnv *_env, jobject _this, jint dev, jint p, jint value) -{ - LOG_API("nDeviceSetConfig dev(%p), param(%i), value(%i)", (void *)dev, p, value); - return rsDeviceSetConfig((RsDevice)dev, (RsDeviceParam)p, value); -} - -static jint -nContextCreate(JNIEnv *_env, jobject _this, jint dev, jint ver, jint sdkVer, jint ct) -{ - LOG_API("nContextCreate"); - return (jint)rsContextCreate((RsDevice)dev, ver, sdkVer, (RsContextType)ct, 0); -} - -static jint -nContextCreateGL(JNIEnv *_env, jobject _this, jint dev, jint ver, jint sdkVer, - int colorMin, int colorPref, - int alphaMin, int alphaPref, - int depthMin, int depthPref, - int stencilMin, int stencilPref, - int samplesMin, int samplesPref, float samplesQ, - int dpi) -{ - RsSurfaceConfig sc; - sc.alphaMin = alphaMin; - sc.alphaPref = alphaPref; - sc.colorMin = colorMin; - sc.colorPref = colorPref; - sc.depthMin = depthMin; - sc.depthPref = depthPref; - sc.samplesMin = samplesMin; - sc.samplesPref = samplesPref; - sc.samplesQ = samplesQ; - - LOG_API("nContextCreateGL"); - return (jint)rsContextCreateGL((RsDevice)dev, ver, sdkVer, sc, dpi); -} - -static void -nContextSetPriority(JNIEnv *_env, jobject _this, RsContext con, jint p) -{ - LOG_API("ContextSetPriority, con(%p), priority(%i)", con, p); - rsContextSetPriority(con, p); -} - - - -static void -nContextSetSurface(JNIEnv *_env, jobject _this, RsContext con, jint width, jint height, jobject wnd) -{ - LOG_API("nContextSetSurface, con(%p), width(%i), height(%i), surface(%p)", con, width, height, (Surface *)wnd); - - ANativeWindow * window = NULL; - if (wnd == NULL) { - - } else { - window = android_view_Surface_getNativeWindow(_env, wnd).get(); - } - - rsContextSetSurface(con, width, height, window); -} - -static void -nContextDestroy(JNIEnv *_env, jobject _this, RsContext con) -{ - LOG_API("nContextDestroy, con(%p)", con); - rsContextDestroy(con); -} - -static void -nContextDump(JNIEnv *_env, jobject _this, RsContext con, jint bits) -{ - LOG_API("nContextDump, con(%p) bits(%i)", (RsContext)con, bits); - rsContextDump((RsContext)con, bits); -} - -static void -nContextPause(JNIEnv *_env, jobject _this, RsContext con) -{ - LOG_API("nContextPause, con(%p)", con); - rsContextPause(con); -} - -static void -nContextResume(JNIEnv *_env, jobject _this, RsContext con) -{ - LOG_API("nContextResume, con(%p)", con); - rsContextResume(con); -} - - -static jstring -nContextGetErrorMessage(JNIEnv *_env, jobject _this, RsContext con) -{ - LOG_API("nContextGetErrorMessage, con(%p)", con); - char buf[1024]; - - size_t receiveLen; - uint32_t subID; - int id = rsContextGetMessage(con, - buf, sizeof(buf), - &receiveLen, sizeof(receiveLen), - &subID, sizeof(subID)); - if (!id && receiveLen) { - ALOGV("message receive buffer too small. %i", receiveLen); - } - return _env->NewStringUTF(buf); -} - -static jint -nContextGetUserMessage(JNIEnv *_env, jobject _this, RsContext con, jintArray data) -{ - jint len = _env->GetArrayLength(data); - LOG_API("nContextGetMessage, con(%p), len(%i)", con, len); - jint *ptr = _env->GetIntArrayElements(data, NULL); - size_t receiveLen; - uint32_t subID; - int id = rsContextGetMessage(con, - ptr, len * 4, - &receiveLen, sizeof(receiveLen), - &subID, sizeof(subID)); - if (!id && receiveLen) { - ALOGV("message receive buffer too small. %i", receiveLen); - } - _env->ReleaseIntArrayElements(data, ptr, 0); - return id; -} - -static jint -nContextPeekMessage(JNIEnv *_env, jobject _this, RsContext con, jintArray auxData) -{ - LOG_API("nContextPeekMessage, con(%p)", con); - jint *auxDataPtr = _env->GetIntArrayElements(auxData, NULL); - size_t receiveLen; - uint32_t subID; - int id = rsContextPeekMessage(con, &receiveLen, sizeof(receiveLen), - &subID, sizeof(subID)); - auxDataPtr[0] = (jint)subID; - auxDataPtr[1] = (jint)receiveLen; - _env->ReleaseIntArrayElements(auxData, auxDataPtr, 0); - return id; -} - -static void nContextInitToClient(JNIEnv *_env, jobject _this, RsContext con) -{ - LOG_API("nContextInitToClient, con(%p)", con); - rsContextInitToClient(con); -} - -static void nContextDeinitToClient(JNIEnv *_env, jobject _this, RsContext con) -{ - LOG_API("nContextDeinitToClient, con(%p)", con); - rsContextDeinitToClient(con); -} - -static void -nContextSendMessage(JNIEnv *_env, jobject _this, RsContext con, jint id, jintArray data) -{ - jint *ptr = NULL; - jint len = 0; - if (data) { - len = _env->GetArrayLength(data); - jint *ptr = _env->GetIntArrayElements(data, NULL); - } - LOG_API("nContextSendMessage, con(%p), id(%i), len(%i)", con, id, len); - rsContextSendMessage(con, id, (const uint8_t *)ptr, len * sizeof(int)); - if (data) { - _env->ReleaseIntArrayElements(data, ptr, JNI_ABORT); - } -} - - - -static jint -nElementCreate(JNIEnv *_env, jobject _this, RsContext con, jint type, jint kind, jboolean norm, jint size) -{ - LOG_API("nElementCreate, con(%p), type(%i), kind(%i), norm(%i), size(%i)", con, type, kind, norm, size); - return (jint)rsElementCreate(con, (RsDataType)type, (RsDataKind)kind, norm, size); -} - -static jint -nElementCreate2(JNIEnv *_env, jobject _this, RsContext con, - jintArray _ids, jobjectArray _names, jintArray _arraySizes) -{ - int fieldCount = _env->GetArrayLength(_ids); - LOG_API("nElementCreate2, con(%p)", con); - - jint *ids = _env->GetIntArrayElements(_ids, NULL); - jint *arraySizes = _env->GetIntArrayElements(_arraySizes, NULL); - - AutoJavaStringArrayToUTF8 names(_env, _names, fieldCount); - - const char **nameArray = names.c_str(); - size_t *sizeArray = names.c_str_len(); - - jint id = (jint)rsElementCreate2(con, - (RsElement *)ids, fieldCount, - nameArray, fieldCount * sizeof(size_t), sizeArray, - (const uint32_t *)arraySizes, fieldCount); - - _env->ReleaseIntArrayElements(_ids, ids, JNI_ABORT); - _env->ReleaseIntArrayElements(_arraySizes, arraySizes, JNI_ABORT); - return (jint)id; -} - -static void -nElementGetNativeData(JNIEnv *_env, jobject _this, RsContext con, jint id, jintArray _elementData) -{ - int dataSize = _env->GetArrayLength(_elementData); - LOG_API("nElementGetNativeData, con(%p)", con); - - // we will pack mType; mKind; mNormalized; mVectorSize; NumSubElements - assert(dataSize == 5); - - uint32_t elementData[5]; - rsaElementGetNativeData(con, (RsElement)id, elementData, dataSize); - - for(jint i = 0; i < dataSize; i ++) { - _env->SetIntArrayRegion(_elementData, i, 1, (const jint*)&elementData[i]); - } -} - - -static void -nElementGetSubElements(JNIEnv *_env, jobject _this, RsContext con, jint id, - jintArray _IDs, - jobjectArray _names, - jintArray _arraySizes) -{ - int dataSize = _env->GetArrayLength(_IDs); - LOG_API("nElementGetSubElements, con(%p)", con); - - uint32_t *ids = (uint32_t *)malloc((uint32_t)dataSize * sizeof(uint32_t)); - const char **names = (const char **)malloc((uint32_t)dataSize * sizeof(const char *)); - uint32_t *arraySizes = (uint32_t *)malloc((uint32_t)dataSize * sizeof(uint32_t)); - - rsaElementGetSubElements(con, (RsElement)id, ids, names, arraySizes, (uint32_t)dataSize); - - for(jint i = 0; i < dataSize; i++) { - _env->SetObjectArrayElement(_names, i, _env->NewStringUTF(names[i])); - _env->SetIntArrayRegion(_IDs, i, 1, (const jint*)&ids[i]); - _env->SetIntArrayRegion(_arraySizes, i, 1, (const jint*)&arraySizes[i]); - } - - free(ids); - free(names); - free(arraySizes); -} - -// ----------------------------------- - -static int -nTypeCreate(JNIEnv *_env, jobject _this, RsContext con, RsElement eid, - jint dimx, jint dimy, jint dimz, jboolean mips, jboolean faces, jint yuv) -{ - LOG_API("nTypeCreate, con(%p) eid(%p), x(%i), y(%i), z(%i), mips(%i), faces(%i), yuv(%i)", - con, eid, dimx, dimy, dimz, mips, faces, yuv); - - jint id = (jint)rsTypeCreate(con, (RsElement)eid, dimx, dimy, dimz, mips, faces, yuv); - return (jint)id; -} - -static void -nTypeGetNativeData(JNIEnv *_env, jobject _this, RsContext con, jint id, jintArray _typeData) -{ - // We are packing 6 items: mDimX; mDimY; mDimZ; - // mDimLOD; mDimFaces; mElement; into typeData - int elementCount = _env->GetArrayLength(_typeData); - - assert(elementCount == 6); - LOG_API("nTypeCreate, con(%p)", con); - - uint32_t typeData[6]; - rsaTypeGetNativeData(con, (RsType)id, typeData, 6); - - for(jint i = 0; i < elementCount; i ++) { - _env->SetIntArrayRegion(_typeData, i, 1, (const jint*)&typeData[i]); - } -} - -// ----------------------------------- - -static jint -nAllocationCreateTyped(JNIEnv *_env, jobject _this, RsContext con, jint type, jint mips, jint usage, jint pointer) -{ - LOG_API("nAllocationCreateTyped, con(%p), type(%p), mip(%i), usage(%i), ptr(%p)", con, (RsElement)type, mips, usage, (void *)pointer); - return (jint) rsAllocationCreateTyped(con, (RsType)type, (RsAllocationMipmapControl)mips, (uint32_t)usage, (uint32_t)pointer); -} - -static void -nAllocationSyncAll(JNIEnv *_env, jobject _this, RsContext con, jint a, jint bits) -{ - LOG_API("nAllocationSyncAll, con(%p), a(%p), bits(0x%08x)", con, (RsAllocation)a, bits); - rsAllocationSyncAll(con, (RsAllocation)a, (RsAllocationUsageType)bits); -} - -static jobject -nAllocationGetSurface(JNIEnv *_env, jobject _this, RsContext con, jint a) -{ - LOG_API("nAllocationGetSurface, con(%p), a(%p)", con, (RsAllocation)a); - - IGraphicBufferProducer *v = (IGraphicBufferProducer *)rsAllocationGetSurface(con, (RsAllocation)a); - sp<IGraphicBufferProducer> bp = v; - v->decStrong(NULL); - - jobject o = android_view_Surface_createFromIGraphicBufferProducer(_env, bp); - return o; -} - -static void -nAllocationSetSurface(JNIEnv *_env, jobject _this, RsContext con, RsAllocation alloc, jobject sur) -{ - LOG_API("nAllocationSetSurface, con(%p), alloc(%p), surface(%p)", - con, alloc, (Surface *)sur); - - sp<Surface> s; - if (sur != 0) { - s = android_view_Surface_getSurface(_env, sur); - } - - rsAllocationSetSurface(con, alloc, static_cast<ANativeWindow *>(s.get())); -} - -static void -nAllocationIoSend(JNIEnv *_env, jobject _this, RsContext con, RsAllocation alloc) -{ - LOG_API("nAllocationIoSend, con(%p), alloc(%p)", con, alloc); - rsAllocationIoSend(con, alloc); -} - -static void -nAllocationIoReceive(JNIEnv *_env, jobject _this, RsContext con, RsAllocation alloc) -{ - LOG_API("nAllocationIoReceive, con(%p), alloc(%p)", con, alloc); - rsAllocationIoReceive(con, alloc); -} - - -static void -nAllocationGenerateMipmaps(JNIEnv *_env, jobject _this, RsContext con, jint alloc) -{ - LOG_API("nAllocationGenerateMipmaps, con(%p), a(%p)", con, (RsAllocation)alloc); - rsAllocationGenerateMipmaps(con, (RsAllocation)alloc); -} - -static int -nAllocationCreateFromBitmap(JNIEnv *_env, jobject _this, RsContext con, jint type, jint mip, jobject jbitmap, jint usage) -{ - SkBitmap const * nativeBitmap = - (SkBitmap const *)_env->GetLongField(jbitmap, gNativeBitmapID); - const SkBitmap& bitmap(*nativeBitmap); - - bitmap.lockPixels(); - const void* ptr = bitmap.getPixels(); - jint id = (jint)rsAllocationCreateFromBitmap(con, - (RsType)type, (RsAllocationMipmapControl)mip, - ptr, bitmap.getSize(), usage); - bitmap.unlockPixels(); - return id; -} - -static int -nAllocationCreateBitmapBackedAllocation(JNIEnv *_env, jobject _this, RsContext con, jint type, jint mip, jobject jbitmap, jint usage) -{ - SkBitmap const * nativeBitmap = - (SkBitmap const *)_env->GetLongField(jbitmap, gNativeBitmapID); - const SkBitmap& bitmap(*nativeBitmap); - - bitmap.lockPixels(); - const void* ptr = bitmap.getPixels(); - jint id = (jint)rsAllocationCreateTyped(con, - (RsType)type, (RsAllocationMipmapControl)mip, - (uint32_t)usage, (size_t)ptr); - bitmap.unlockPixels(); - return id; -} - -static int -nAllocationCubeCreateFromBitmap(JNIEnv *_env, jobject _this, RsContext con, jint type, jint mip, jobject jbitmap, jint usage) -{ - SkBitmap const * nativeBitmap = - (SkBitmap const *)_env->GetLongField(jbitmap, gNativeBitmapID); - const SkBitmap& bitmap(*nativeBitmap); - - bitmap.lockPixels(); - const void* ptr = bitmap.getPixels(); - jint id = (jint)rsAllocationCubeCreateFromBitmap(con, - (RsType)type, (RsAllocationMipmapControl)mip, - ptr, bitmap.getSize(), usage); - bitmap.unlockPixels(); - return id; -} - -static void -nAllocationCopyFromBitmap(JNIEnv *_env, jobject _this, RsContext con, jint alloc, jobject jbitmap) -{ - SkBitmap const * nativeBitmap = - (SkBitmap const *)_env->GetLongField(jbitmap, gNativeBitmapID); - const SkBitmap& bitmap(*nativeBitmap); - int w = bitmap.width(); - int h = bitmap.height(); - - bitmap.lockPixels(); - const void* ptr = bitmap.getPixels(); - rsAllocation2DData(con, (RsAllocation)alloc, 0, 0, - 0, RS_ALLOCATION_CUBEMAP_FACE_POSITIVE_X, - w, h, ptr, bitmap.getSize(), 0); - bitmap.unlockPixels(); -} - -static void -nAllocationCopyToBitmap(JNIEnv *_env, jobject _this, RsContext con, jint alloc, jobject jbitmap) -{ - SkBitmap const * nativeBitmap = - (SkBitmap const *)_env->GetLongField(jbitmap, gNativeBitmapID); - const SkBitmap& bitmap(*nativeBitmap); - - bitmap.lockPixels(); - void* ptr = bitmap.getPixels(); - rsAllocationCopyToBitmap(con, (RsAllocation)alloc, ptr, bitmap.getSize()); - bitmap.unlockPixels(); - bitmap.notifyPixelsChanged(); -} - -static void ReleaseBitmapCallback(void *bmp) -{ - SkBitmap const * nativeBitmap = (SkBitmap const *)bmp; - nativeBitmap->unlockPixels(); -} - - -static void -nAllocationData1D_i(JNIEnv *_env, jobject _this, RsContext con, jint alloc, jint offset, jint lod, jint count, jintArray data, int sizeBytes) -{ - jint len = _env->GetArrayLength(data); - LOG_API("nAllocation1DData_i, con(%p), adapter(%p), offset(%i), count(%i), len(%i), sizeBytes(%i)", con, (RsAllocation)alloc, offset, count, len, sizeBytes); - jint *ptr = _env->GetIntArrayElements(data, NULL); - rsAllocation1DData(con, (RsAllocation)alloc, offset, lod, count, ptr, sizeBytes); - _env->ReleaseIntArrayElements(data, ptr, JNI_ABORT); -} - -static void -nAllocationData1D_s(JNIEnv *_env, jobject _this, RsContext con, jint alloc, jint offset, jint lod, jint count, jshortArray data, int sizeBytes) -{ - jint len = _env->GetArrayLength(data); - LOG_API("nAllocation1DData_s, con(%p), adapter(%p), offset(%i), count(%i), len(%i), sizeBytes(%i)", con, (RsAllocation)alloc, offset, count, len, sizeBytes); - jshort *ptr = _env->GetShortArrayElements(data, NULL); - rsAllocation1DData(con, (RsAllocation)alloc, offset, lod, count, ptr, sizeBytes); - _env->ReleaseShortArrayElements(data, ptr, JNI_ABORT); -} - -static void -nAllocationData1D_b(JNIEnv *_env, jobject _this, RsContext con, jint alloc, jint offset, jint lod, jint count, jbyteArray data, int sizeBytes) -{ - jint len = _env->GetArrayLength(data); - LOG_API("nAllocation1DData_b, con(%p), adapter(%p), offset(%i), count(%i), len(%i), sizeBytes(%i)", con, (RsAllocation)alloc, offset, count, len, sizeBytes); - jbyte *ptr = _env->GetByteArrayElements(data, NULL); - rsAllocation1DData(con, (RsAllocation)alloc, offset, lod, count, ptr, sizeBytes); - _env->ReleaseByteArrayElements(data, ptr, JNI_ABORT); -} - -static void -nAllocationData1D_f(JNIEnv *_env, jobject _this, RsContext con, jint alloc, jint offset, jint lod, jint count, jfloatArray data, int sizeBytes) -{ - jint len = _env->GetArrayLength(data); - LOG_API("nAllocation1DData_f, con(%p), adapter(%p), offset(%i), count(%i), len(%i), sizeBytes(%i)", con, (RsAllocation)alloc, offset, count, len, sizeBytes); - jfloat *ptr = _env->GetFloatArrayElements(data, NULL); - rsAllocation1DData(con, (RsAllocation)alloc, offset, lod, count, ptr, sizeBytes); - _env->ReleaseFloatArrayElements(data, ptr, JNI_ABORT); -} - -static void -// native void rsnAllocationElementData1D(int con, int id, int xoff, int compIdx, byte[] d, int sizeBytes); -nAllocationElementData1D(JNIEnv *_env, jobject _this, RsContext con, jint alloc, jint offset, jint lod, jint compIdx, jbyteArray data, int sizeBytes) -{ - jint len = _env->GetArrayLength(data); - LOG_API("nAllocationElementData1D, con(%p), alloc(%p), offset(%i), comp(%i), len(%i), sizeBytes(%i)", con, (RsAllocation)alloc, offset, compIdx, len, sizeBytes); - jbyte *ptr = _env->GetByteArrayElements(data, NULL); - rsAllocation1DElementData(con, (RsAllocation)alloc, offset, lod, ptr, sizeBytes, compIdx); - _env->ReleaseByteArrayElements(data, ptr, JNI_ABORT); -} - -static void -nAllocationData2D_s(JNIEnv *_env, jobject _this, RsContext con, jint alloc, jint xoff, jint yoff, jint lod, jint face, - jint w, jint h, jshortArray data, int sizeBytes) -{ - jint len = _env->GetArrayLength(data); - LOG_API("nAllocation2DData_s, con(%p), adapter(%p), xoff(%i), yoff(%i), w(%i), h(%i), len(%i)", con, (RsAllocation)alloc, xoff, yoff, w, h, len); - jshort *ptr = _env->GetShortArrayElements(data, NULL); - rsAllocation2DData(con, (RsAllocation)alloc, xoff, yoff, lod, (RsAllocationCubemapFace)face, w, h, ptr, sizeBytes, 0); - _env->ReleaseShortArrayElements(data, ptr, JNI_ABORT); -} - -static void -nAllocationData2D_b(JNIEnv *_env, jobject _this, RsContext con, jint alloc, jint xoff, jint yoff, jint lod, jint face, - jint w, jint h, jbyteArray data, int sizeBytes) -{ - jint len = _env->GetArrayLength(data); - LOG_API("nAllocation2DData_b, con(%p), adapter(%p), xoff(%i), yoff(%i), w(%i), h(%i), len(%i)", con, (RsAllocation)alloc, xoff, yoff, w, h, len); - jbyte *ptr = _env->GetByteArrayElements(data, NULL); - rsAllocation2DData(con, (RsAllocation)alloc, xoff, yoff, lod, (RsAllocationCubemapFace)face, w, h, ptr, sizeBytes, 0); - _env->ReleaseByteArrayElements(data, ptr, JNI_ABORT); -} - -static void -nAllocationData2D_i(JNIEnv *_env, jobject _this, RsContext con, jint alloc, jint xoff, jint yoff, jint lod, jint face, - jint w, jint h, jintArray data, int sizeBytes) -{ - jint len = _env->GetArrayLength(data); - LOG_API("nAllocation2DData_i, con(%p), adapter(%p), xoff(%i), yoff(%i), w(%i), h(%i), len(%i)", con, (RsAllocation)alloc, xoff, yoff, w, h, len); - jint *ptr = _env->GetIntArrayElements(data, NULL); - rsAllocation2DData(con, (RsAllocation)alloc, xoff, yoff, lod, (RsAllocationCubemapFace)face, w, h, ptr, sizeBytes, 0); - _env->ReleaseIntArrayElements(data, ptr, JNI_ABORT); -} - -static void -nAllocationData2D_f(JNIEnv *_env, jobject _this, RsContext con, jint alloc, jint xoff, jint yoff, jint lod, jint face, - jint w, jint h, jfloatArray data, int sizeBytes) -{ - jint len = _env->GetArrayLength(data); - LOG_API("nAllocation2DData_i, con(%p), adapter(%p), xoff(%i), yoff(%i), w(%i), h(%i), len(%i)", con, (RsAllocation)alloc, xoff, yoff, w, h, len); - jfloat *ptr = _env->GetFloatArrayElements(data, NULL); - rsAllocation2DData(con, (RsAllocation)alloc, xoff, yoff, lod, (RsAllocationCubemapFace)face, w, h, ptr, sizeBytes, 0); - _env->ReleaseFloatArrayElements(data, ptr, JNI_ABORT); -} - -static void -nAllocationData2D_alloc(JNIEnv *_env, jobject _this, RsContext con, - jint dstAlloc, jint dstXoff, jint dstYoff, - jint dstMip, jint dstFace, - jint width, jint height, - jint srcAlloc, jint srcXoff, jint srcYoff, - jint srcMip, jint srcFace) -{ - LOG_API("nAllocation2DData_s, con(%p), dstAlloc(%p), dstXoff(%i), dstYoff(%i)," - " dstMip(%i), dstFace(%i), width(%i), height(%i)," - " srcAlloc(%p), srcXoff(%i), srcYoff(%i), srcMip(%i), srcFace(%i)", - con, (RsAllocation)dstAlloc, dstXoff, dstYoff, dstMip, dstFace, - width, height, (RsAllocation)srcAlloc, srcXoff, srcYoff, srcMip, srcFace); - - rsAllocationCopy2DRange(con, - (RsAllocation)dstAlloc, - dstXoff, dstYoff, - dstMip, dstFace, - width, height, - (RsAllocation)srcAlloc, - srcXoff, srcYoff, - srcMip, srcFace); -} - -static void -nAllocationData3D_s(JNIEnv *_env, jobject _this, RsContext con, jint alloc, jint xoff, jint yoff, jint zoff, jint lod, - jint w, jint h, jint d, jshortArray data, int sizeBytes) -{ - jint len = _env->GetArrayLength(data); - LOG_API("nAllocation3DData_s, con(%p), adapter(%p), xoff(%i), yoff(%i), w(%i), h(%i), len(%i)", con, (RsAllocation)alloc, xoff, yoff, zoff, w, h, d, len); - jshort *ptr = _env->GetShortArrayElements(data, NULL); - rsAllocation3DData(con, (RsAllocation)alloc, xoff, yoff, zoff, lod, w, h, d, ptr, sizeBytes, 0); - _env->ReleaseShortArrayElements(data, ptr, JNI_ABORT); -} - -static void -nAllocationData3D_b(JNIEnv *_env, jobject _this, RsContext con, jint alloc, jint xoff, jint yoff, jint zoff, jint lod, - jint w, jint h, jint d, jbyteArray data, int sizeBytes) -{ - jint len = _env->GetArrayLength(data); - LOG_API("nAllocation3DData_b, con(%p), adapter(%p), xoff(%i), yoff(%i), w(%i), h(%i), len(%i)", con, (RsAllocation)alloc, xoff, yoff, zoff, w, h, d, len); - jbyte *ptr = _env->GetByteArrayElements(data, NULL); - rsAllocation3DData(con, (RsAllocation)alloc, xoff, yoff, zoff, lod, w, h, d, ptr, sizeBytes, 0); - _env->ReleaseByteArrayElements(data, ptr, JNI_ABORT); -} - -static void -nAllocationData3D_i(JNIEnv *_env, jobject _this, RsContext con, jint alloc, jint xoff, jint yoff, jint zoff, jint lod, - jint w, jint h, jint d, jintArray data, int sizeBytes) -{ - jint len = _env->GetArrayLength(data); - LOG_API("nAllocation3DData_i, con(%p), adapter(%p), xoff(%i), yoff(%i), w(%i), h(%i), len(%i)", con, (RsAllocation)alloc, xoff, yoff, zoff, w, h, d, len); - jint *ptr = _env->GetIntArrayElements(data, NULL); - rsAllocation3DData(con, (RsAllocation)alloc, xoff, yoff, zoff, lod, w, h, d, ptr, sizeBytes, 0); - _env->ReleaseIntArrayElements(data, ptr, JNI_ABORT); -} - -static void -nAllocationData3D_f(JNIEnv *_env, jobject _this, RsContext con, jint alloc, jint xoff, jint yoff, jint zoff, jint lod, - jint w, jint h, jint d, jfloatArray data, int sizeBytes) -{ - jint len = _env->GetArrayLength(data); - LOG_API("nAllocation3DData_f, con(%p), adapter(%p), xoff(%i), yoff(%i), w(%i), h(%i), len(%i)", con, (RsAllocation)alloc, xoff, yoff, zoff, w, h, d, len); - jfloat *ptr = _env->GetFloatArrayElements(data, NULL); - rsAllocation3DData(con, (RsAllocation)alloc, xoff, yoff, zoff, lod, w, h, d, ptr, sizeBytes, 0); - _env->ReleaseFloatArrayElements(data, ptr, JNI_ABORT); -} - -static void -nAllocationData3D_alloc(JNIEnv *_env, jobject _this, RsContext con, - jint dstAlloc, jint dstXoff, jint dstYoff, jint dstZoff, - jint dstMip, - jint width, jint height, jint depth, - jint srcAlloc, jint srcXoff, jint srcYoff, jint srcZoff, - jint srcMip) -{ - LOG_API("nAllocationData3D_alloc, con(%p), dstAlloc(%p), dstXoff(%i), dstYoff(%i)," - " dstMip(%i), width(%i), height(%i)," - " srcAlloc(%p), srcXoff(%i), srcYoff(%i), srcMip(%i)", - con, (RsAllocation)dstAlloc, dstXoff, dstYoff, dstMip, dstFace, - width, height, (RsAllocation)srcAlloc, srcXoff, srcYoff, srcMip, srcFace); - - rsAllocationCopy3DRange(con, - (RsAllocation)dstAlloc, - dstXoff, dstYoff, dstZoff, dstMip, - width, height, depth, - (RsAllocation)srcAlloc, - srcXoff, srcYoff, srcZoff, srcMip); -} - -static void -nAllocationRead_i(JNIEnv *_env, jobject _this, RsContext con, jint alloc, jintArray data) -{ - jint len = _env->GetArrayLength(data); - LOG_API("nAllocationRead_i, con(%p), alloc(%p), len(%i)", con, (RsAllocation)alloc, len); - jint *ptr = _env->GetIntArrayElements(data, NULL); - jsize length = _env->GetArrayLength(data); - rsAllocationRead(con, (RsAllocation)alloc, ptr, length * sizeof(int)); - _env->ReleaseIntArrayElements(data, ptr, 0); -} - -static void -nAllocationRead_s(JNIEnv *_env, jobject _this, RsContext con, jint alloc, jshortArray data) -{ - jint len = _env->GetArrayLength(data); - LOG_API("nAllocationRead_i, con(%p), alloc(%p), len(%i)", con, (RsAllocation)alloc, len); - jshort *ptr = _env->GetShortArrayElements(data, NULL); - jsize length = _env->GetArrayLength(data); - rsAllocationRead(con, (RsAllocation)alloc, ptr, length * sizeof(short)); - _env->ReleaseShortArrayElements(data, ptr, 0); -} - -static void -nAllocationRead_b(JNIEnv *_env, jobject _this, RsContext con, jint alloc, jbyteArray data) -{ - jint len = _env->GetArrayLength(data); - LOG_API("nAllocationRead_i, con(%p), alloc(%p), len(%i)", con, (RsAllocation)alloc, len); - jbyte *ptr = _env->GetByteArrayElements(data, NULL); - jsize length = _env->GetArrayLength(data); - rsAllocationRead(con, (RsAllocation)alloc, ptr, length * sizeof(char)); - _env->ReleaseByteArrayElements(data, ptr, 0); -} - -static void -nAllocationRead_f(JNIEnv *_env, jobject _this, RsContext con, jint alloc, jfloatArray data) -{ - jint len = _env->GetArrayLength(data); - LOG_API("nAllocationRead_f, con(%p), alloc(%p), len(%i)", con, (RsAllocation)alloc, len); - jfloat *ptr = _env->GetFloatArrayElements(data, NULL); - jsize length = _env->GetArrayLength(data); - rsAllocationRead(con, (RsAllocation)alloc, ptr, length * sizeof(float)); - _env->ReleaseFloatArrayElements(data, ptr, 0); -} - -static jint -nAllocationGetType(JNIEnv *_env, jobject _this, RsContext con, jint a) -{ - LOG_API("nAllocationGetType, con(%p), a(%p)", con, (RsAllocation)a); - return (jint) rsaAllocationGetType(con, (RsAllocation)a); -} - -static void -nAllocationResize1D(JNIEnv *_env, jobject _this, RsContext con, jint alloc, jint dimX) -{ - LOG_API("nAllocationResize1D, con(%p), alloc(%p), sizeX(%i)", con, (RsAllocation)alloc, dimX); - rsAllocationResize1D(con, (RsAllocation)alloc, dimX); -} - -// ----------------------------------- - -static int -nFileA3DCreateFromAssetStream(JNIEnv *_env, jobject _this, RsContext con, jint native_asset) -{ - ALOGV("______nFileA3D %u", (uint32_t) native_asset); - - Asset* asset = reinterpret_cast<Asset*>(native_asset); - - jint id = (jint)rsaFileA3DCreateFromMemory(con, asset->getBuffer(false), asset->getLength()); - return id; -} - -static int -nFileA3DCreateFromAsset(JNIEnv *_env, jobject _this, RsContext con, jobject _assetMgr, jstring _path) -{ - AssetManager* mgr = assetManagerForJavaObject(_env, _assetMgr); - if (mgr == NULL) { - return 0; - } - - AutoJavaStringToUTF8 str(_env, _path); - Asset* asset = mgr->open(str.c_str(), Asset::ACCESS_BUFFER); - if (asset == NULL) { - return 0; - } - - jint id = (jint)rsaFileA3DCreateFromAsset(con, asset); - return id; -} - -static int -nFileA3DCreateFromFile(JNIEnv *_env, jobject _this, RsContext con, jstring fileName) -{ - AutoJavaStringToUTF8 fileNameUTF(_env, fileName); - jint id = (jint)rsaFileA3DCreateFromFile(con, fileNameUTF.c_str()); - - return id; -} - -static int -nFileA3DGetNumIndexEntries(JNIEnv *_env, jobject _this, RsContext con, jint fileA3D) -{ - int32_t numEntries = 0; - rsaFileA3DGetNumIndexEntries(con, &numEntries, (RsFile)fileA3D); - return numEntries; -} - -static void -nFileA3DGetIndexEntries(JNIEnv *_env, jobject _this, RsContext con, jint fileA3D, jint numEntries, jintArray _ids, jobjectArray _entries) -{ - ALOGV("______nFileA3D %u", (uint32_t) fileA3D); - RsFileIndexEntry *fileEntries = (RsFileIndexEntry*)malloc((uint32_t)numEntries * sizeof(RsFileIndexEntry)); - - rsaFileA3DGetIndexEntries(con, fileEntries, (uint32_t)numEntries, (RsFile)fileA3D); - - for(jint i = 0; i < numEntries; i ++) { - _env->SetObjectArrayElement(_entries, i, _env->NewStringUTF(fileEntries[i].objectName)); - _env->SetIntArrayRegion(_ids, i, 1, (const jint*)&fileEntries[i].classID); - } - - free(fileEntries); -} - -static int -nFileA3DGetEntryByIndex(JNIEnv *_env, jobject _this, RsContext con, jint fileA3D, jint index) -{ - ALOGV("______nFileA3D %u", (uint32_t) fileA3D); - jint id = (jint)rsaFileA3DGetEntryByIndex(con, (uint32_t)index, (RsFile)fileA3D); - return id; -} - -// ----------------------------------- - -static int -nFontCreateFromFile(JNIEnv *_env, jobject _this, RsContext con, - jstring fileName, jfloat fontSize, jint dpi) -{ - AutoJavaStringToUTF8 fileNameUTF(_env, fileName); - jint id = (jint)rsFontCreateFromFile(con, - fileNameUTF.c_str(), fileNameUTF.length(), - fontSize, dpi); - - return id; -} - -static int -nFontCreateFromAssetStream(JNIEnv *_env, jobject _this, RsContext con, - jstring name, jfloat fontSize, jint dpi, jint native_asset) -{ - Asset* asset = reinterpret_cast<Asset*>(native_asset); - AutoJavaStringToUTF8 nameUTF(_env, name); - - jint id = (jint)rsFontCreateFromMemory(con, - nameUTF.c_str(), nameUTF.length(), - fontSize, dpi, - asset->getBuffer(false), asset->getLength()); - return id; -} - -static int -nFontCreateFromAsset(JNIEnv *_env, jobject _this, RsContext con, jobject _assetMgr, jstring _path, - jfloat fontSize, jint dpi) -{ - AssetManager* mgr = assetManagerForJavaObject(_env, _assetMgr); - if (mgr == NULL) { - return 0; - } - - AutoJavaStringToUTF8 str(_env, _path); - Asset* asset = mgr->open(str.c_str(), Asset::ACCESS_BUFFER); - if (asset == NULL) { - return 0; - } - - jint id = (jint)rsFontCreateFromMemory(con, - str.c_str(), str.length(), - fontSize, dpi, - asset->getBuffer(false), asset->getLength()); - delete asset; - return id; -} - -// ----------------------------------- - -static void -nScriptBindAllocation(JNIEnv *_env, jobject _this, RsContext con, jint script, jint alloc, jint slot) -{ - LOG_API("nScriptBindAllocation, con(%p), script(%p), alloc(%p), slot(%i)", con, (RsScript)script, (RsAllocation)alloc, slot); - rsScriptBindAllocation(con, (RsScript)script, (RsAllocation)alloc, slot); -} - -static void -nScriptSetVarI(JNIEnv *_env, jobject _this, RsContext con, jint script, jint slot, jint val) -{ - LOG_API("nScriptSetVarI, con(%p), s(%p), slot(%i), val(%i)", con, (void *)script, slot, val); - rsScriptSetVarI(con, (RsScript)script, slot, val); -} - -static jint -nScriptGetVarI(JNIEnv *_env, jobject _this, RsContext con, jint script, jint slot) -{ - LOG_API("nScriptGetVarI, con(%p), s(%p), slot(%i)", con, (void *)script, slot); - int value = 0; - rsScriptGetVarV(con, (RsScript)script, slot, &value, sizeof(value)); - return value; -} - -static void -nScriptSetVarObj(JNIEnv *_env, jobject _this, RsContext con, jint script, jint slot, jint val) -{ - LOG_API("nScriptSetVarObj, con(%p), s(%p), slot(%i), val(%i)", con, (void *)script, slot, val); - rsScriptSetVarObj(con, (RsScript)script, slot, (RsObjectBase)val); -} - -static void -nScriptSetVarJ(JNIEnv *_env, jobject _this, RsContext con, jint script, jint slot, jlong val) -{ - LOG_API("nScriptSetVarJ, con(%p), s(%p), slot(%i), val(%lli)", con, (void *)script, slot, val); - rsScriptSetVarJ(con, (RsScript)script, slot, val); -} - -static jlong -nScriptGetVarJ(JNIEnv *_env, jobject _this, RsContext con, jint script, jint slot) -{ - LOG_API("nScriptGetVarJ, con(%p), s(%p), slot(%i)", con, (void *)script, slot); - jlong value = 0; - rsScriptGetVarV(con, (RsScript)script, slot, &value, sizeof(value)); - return value; -} - -static void -nScriptSetVarF(JNIEnv *_env, jobject _this, RsContext con, jint script, jint slot, float val) -{ - LOG_API("nScriptSetVarF, con(%p), s(%p), slot(%i), val(%f)", con, (void *)script, slot, val); - rsScriptSetVarF(con, (RsScript)script, slot, val); -} - -static jfloat -nScriptGetVarF(JNIEnv *_env, jobject _this, RsContext con, jint script, jint slot) -{ - LOG_API("nScriptGetVarF, con(%p), s(%p), slot(%i)", con, (void *)script, slot); - jfloat value = 0; - rsScriptGetVarV(con, (RsScript)script, slot, &value, sizeof(value)); - return value; -} - -static void -nScriptSetVarD(JNIEnv *_env, jobject _this, RsContext con, jint script, jint slot, double val) -{ - LOG_API("nScriptSetVarD, con(%p), s(%p), slot(%i), val(%lf)", con, (void *)script, slot, val); - rsScriptSetVarD(con, (RsScript)script, slot, val); -} - -static jdouble -nScriptGetVarD(JNIEnv *_env, jobject _this, RsContext con, jint script, jint slot) -{ - LOG_API("nScriptGetVarD, con(%p), s(%p), slot(%i)", con, (void *)script, slot); - jdouble value = 0; - rsScriptGetVarV(con, (RsScript)script, slot, &value, sizeof(value)); - return value; -} - -static void -nScriptSetVarV(JNIEnv *_env, jobject _this, RsContext con, jint script, jint slot, jbyteArray data) -{ - LOG_API("nScriptSetVarV, con(%p), s(%p), slot(%i)", con, (void *)script, slot); - jint len = _env->GetArrayLength(data); - jbyte *ptr = _env->GetByteArrayElements(data, NULL); - rsScriptSetVarV(con, (RsScript)script, slot, ptr, len); - _env->ReleaseByteArrayElements(data, ptr, JNI_ABORT); -} - -static void -nScriptGetVarV(JNIEnv *_env, jobject _this, RsContext con, jint script, jint slot, jbyteArray data) -{ - LOG_API("nScriptSetVarV, con(%p), s(%p), slot(%i)", con, (void *)script, slot); - jint len = _env->GetArrayLength(data); - jbyte *ptr = _env->GetByteArrayElements(data, NULL); - rsScriptGetVarV(con, (RsScript)script, slot, ptr, len); - _env->ReleaseByteArrayElements(data, ptr, JNI_ABORT); -} - -static void -nScriptSetVarVE(JNIEnv *_env, jobject _this, RsContext con, jint script, jint slot, jbyteArray data, jint elem, jintArray dims) -{ - LOG_API("nScriptSetVarVE, con(%p), s(%p), slot(%i)", con, (void *)script, slot); - jint len = _env->GetArrayLength(data); - jbyte *ptr = _env->GetByteArrayElements(data, NULL); - jint dimsLen = _env->GetArrayLength(dims) * sizeof(int); - jint *dimsPtr = _env->GetIntArrayElements(dims, NULL); - rsScriptSetVarVE(con, (RsScript)script, slot, ptr, len, (RsElement)elem, - (const size_t*) dimsPtr, dimsLen); - _env->ReleaseByteArrayElements(data, ptr, JNI_ABORT); - _env->ReleaseIntArrayElements(dims, dimsPtr, JNI_ABORT); -} - - -static void -nScriptSetTimeZone(JNIEnv *_env, jobject _this, RsContext con, jint script, jbyteArray timeZone) -{ - LOG_API("nScriptCSetTimeZone, con(%p), s(%p), timeZone(%s)", con, (void *)script, (const char *)timeZone); - - jint length = _env->GetArrayLength(timeZone); - jbyte* timeZone_ptr; - timeZone_ptr = (jbyte *) _env->GetPrimitiveArrayCritical(timeZone, (jboolean *)0); - - rsScriptSetTimeZone(con, (RsScript)script, (const char *)timeZone_ptr, length); - - if (timeZone_ptr) { - _env->ReleasePrimitiveArrayCritical(timeZone, timeZone_ptr, 0); - } -} - -static void -nScriptInvoke(JNIEnv *_env, jobject _this, RsContext con, jint obj, jint slot) -{ - LOG_API("nScriptInvoke, con(%p), script(%p)", con, (void *)obj); - rsScriptInvoke(con, (RsScript)obj, slot); -} - -static void -nScriptInvokeV(JNIEnv *_env, jobject _this, RsContext con, jint script, jint slot, jbyteArray data) -{ - LOG_API("nScriptInvokeV, con(%p), s(%p), slot(%i)", con, (void *)script, slot); - jint len = _env->GetArrayLength(data); - jbyte *ptr = _env->GetByteArrayElements(data, NULL); - rsScriptInvokeV(con, (RsScript)script, slot, ptr, len); - _env->ReleaseByteArrayElements(data, ptr, JNI_ABORT); -} - -static void -nScriptForEach(JNIEnv *_env, jobject _this, RsContext con, - jint script, jint slot, jint ain, jint aout) -{ - LOG_API("nScriptForEach, con(%p), s(%p), slot(%i)", con, (void *)script, slot); - rsScriptForEach(con, (RsScript)script, slot, (RsAllocation)ain, (RsAllocation)aout, NULL, 0, NULL, 0); -} -static void -nScriptForEachV(JNIEnv *_env, jobject _this, RsContext con, - jint script, jint slot, jint ain, jint aout, jbyteArray params) -{ - LOG_API("nScriptForEach, con(%p), s(%p), slot(%i)", con, (void *)script, slot); - jint len = _env->GetArrayLength(params); - jbyte *ptr = _env->GetByteArrayElements(params, NULL); - rsScriptForEach(con, (RsScript)script, slot, (RsAllocation)ain, (RsAllocation)aout, ptr, len, NULL, 0); - _env->ReleaseByteArrayElements(params, ptr, JNI_ABORT); -} - -static void -nScriptForEachClipped(JNIEnv *_env, jobject _this, RsContext con, - jint script, jint slot, jint ain, jint aout, - jint xstart, jint xend, - jint ystart, jint yend, jint zstart, jint zend) -{ - LOG_API("nScriptForEachClipped, con(%p), s(%p), slot(%i)", con, (void *)script, slot); - RsScriptCall sc; - sc.xStart = xstart; - sc.xEnd = xend; - sc.yStart = ystart; - sc.yEnd = yend; - sc.zStart = zstart; - sc.zEnd = zend; - sc.strategy = RS_FOR_EACH_STRATEGY_DONT_CARE; - sc.arrayStart = 0; - sc.arrayEnd = 0; - rsScriptForEach(con, (RsScript)script, slot, (RsAllocation)ain, (RsAllocation)aout, NULL, 0, &sc, sizeof(sc)); -} - -static void -nScriptForEachClippedV(JNIEnv *_env, jobject _this, RsContext con, - jint script, jint slot, jint ain, jint aout, - jbyteArray params, jint xstart, jint xend, - jint ystart, jint yend, jint zstart, jint zend) -{ - LOG_API("nScriptForEachClipped, con(%p), s(%p), slot(%i)", con, (void *)script, slot); - jint len = _env->GetArrayLength(params); - jbyte *ptr = _env->GetByteArrayElements(params, NULL); - RsScriptCall sc; - sc.xStart = xstart; - sc.xEnd = xend; - sc.yStart = ystart; - sc.yEnd = yend; - sc.zStart = zstart; - sc.zEnd = zend; - sc.strategy = RS_FOR_EACH_STRATEGY_DONT_CARE; - sc.arrayStart = 0; - sc.arrayEnd = 0; - rsScriptForEach(con, (RsScript)script, slot, (RsAllocation)ain, (RsAllocation)aout, ptr, len, &sc, sizeof(sc)); - _env->ReleaseByteArrayElements(params, ptr, JNI_ABORT); -} - -// ----------------------------------- - -static jint -nScriptCCreate(JNIEnv *_env, jobject _this, RsContext con, - jstring resName, jstring cacheDir, - jbyteArray scriptRef, jint length) -{ - LOG_API("nScriptCCreate, con(%p)", con); - - AutoJavaStringToUTF8 resNameUTF(_env, resName); - AutoJavaStringToUTF8 cacheDirUTF(_env, cacheDir); - jint ret = 0; - jbyte* script_ptr = NULL; - jint _exception = 0; - jint remaining; - if (!scriptRef) { - _exception = 1; - //jniThrowException(_env, "java/lang/IllegalArgumentException", "script == null"); - goto exit; - } - if (length < 0) { - _exception = 1; - //jniThrowException(_env, "java/lang/IllegalArgumentException", "length < 0"); - goto exit; - } - remaining = _env->GetArrayLength(scriptRef); - if (remaining < length) { - _exception = 1; - //jniThrowException(_env, "java/lang/IllegalArgumentException", - // "length > script.length - offset"); - goto exit; - } - script_ptr = (jbyte *) - _env->GetPrimitiveArrayCritical(scriptRef, (jboolean *)0); - - //rsScriptCSetText(con, (const char *)script_ptr, length); - - ret = (jint)rsScriptCCreate(con, - resNameUTF.c_str(), resNameUTF.length(), - cacheDirUTF.c_str(), cacheDirUTF.length(), - (const char *)script_ptr, length); - -exit: - if (script_ptr) { - _env->ReleasePrimitiveArrayCritical(scriptRef, script_ptr, - _exception ? JNI_ABORT: 0); - } - - return ret; -} - -static jint -nScriptIntrinsicCreate(JNIEnv *_env, jobject _this, RsContext con, jint id, jint eid) -{ - LOG_API("nScriptIntrinsicCreate, con(%p) id(%i) element(%p)", con, id, (void *)eid); - return (jint)rsScriptIntrinsicCreate(con, id, (RsElement)eid); -} - -static jint -nScriptKernelIDCreate(JNIEnv *_env, jobject _this, RsContext con, jint sid, jint slot, jint sig) -{ - LOG_API("nScriptKernelIDCreate, con(%p) script(%p), slot(%i), sig(%i)", con, (void *)sid, slot, sig); - return (jint)rsScriptKernelIDCreate(con, (RsScript)sid, slot, sig); -} - -static jint -nScriptFieldIDCreate(JNIEnv *_env, jobject _this, RsContext con, jint sid, jint slot) -{ - LOG_API("nScriptFieldIDCreate, con(%p) script(%p), slot(%i)", con, (void *)sid, slot); - return (jint)rsScriptFieldIDCreate(con, (RsScript)sid, slot); -} - -static jint -nScriptGroupCreate(JNIEnv *_env, jobject _this, RsContext con, jintArray _kernels, jintArray _src, - jintArray _dstk, jintArray _dstf, jintArray _types) -{ - LOG_API("nScriptGroupCreate, con(%p)", con); - - jint kernelsLen = _env->GetArrayLength(_kernels) * sizeof(int); - jint *kernelsPtr = _env->GetIntArrayElements(_kernels, NULL); - jint srcLen = _env->GetArrayLength(_src) * sizeof(int); - jint *srcPtr = _env->GetIntArrayElements(_src, NULL); - jint dstkLen = _env->GetArrayLength(_dstk) * sizeof(int); - jint *dstkPtr = _env->GetIntArrayElements(_dstk, NULL); - jint dstfLen = _env->GetArrayLength(_dstf) * sizeof(int); - jint *dstfPtr = _env->GetIntArrayElements(_dstf, NULL); - jint typesLen = _env->GetArrayLength(_types) * sizeof(int); - jint *typesPtr = _env->GetIntArrayElements(_types, NULL); - - int id = (int)rsScriptGroupCreate(con, - (RsScriptKernelID *)kernelsPtr, kernelsLen, - (RsScriptKernelID *)srcPtr, srcLen, - (RsScriptKernelID *)dstkPtr, dstkLen, - (RsScriptFieldID *)dstfPtr, dstfLen, - (RsType *)typesPtr, typesLen); - - _env->ReleaseIntArrayElements(_kernels, kernelsPtr, 0); - _env->ReleaseIntArrayElements(_src, srcPtr, 0); - _env->ReleaseIntArrayElements(_dstk, dstkPtr, 0); - _env->ReleaseIntArrayElements(_dstf, dstfPtr, 0); - _env->ReleaseIntArrayElements(_types, typesPtr, 0); - return id; -} - -static void -nScriptGroupSetInput(JNIEnv *_env, jobject _this, RsContext con, jint gid, jint kid, jint alloc) -{ - LOG_API("nScriptGroupSetInput, con(%p) group(%p), kernelId(%p), alloc(%p)", con, - (void *)gid, (void *)kid, (void *)alloc); - rsScriptGroupSetInput(con, (RsScriptGroup)gid, (RsScriptKernelID)kid, (RsAllocation)alloc); -} - -static void -nScriptGroupSetOutput(JNIEnv *_env, jobject _this, RsContext con, jint gid, jint kid, jint alloc) -{ - LOG_API("nScriptGroupSetOutput, con(%p) group(%p), kernelId(%p), alloc(%p)", con, - (void *)gid, (void *)kid, (void *)alloc); - rsScriptGroupSetOutput(con, (RsScriptGroup)gid, (RsScriptKernelID)kid, (RsAllocation)alloc); -} - -static void -nScriptGroupExecute(JNIEnv *_env, jobject _this, RsContext con, jint gid) -{ - LOG_API("nScriptGroupSetOutput, con(%p) group(%p)", con, (void *)gid); - rsScriptGroupExecute(con, (RsScriptGroup)gid); -} - -// --------------------------------------------------------------------------- - -static jint -nProgramStoreCreate(JNIEnv *_env, jobject _this, RsContext con, - jboolean colorMaskR, jboolean colorMaskG, jboolean colorMaskB, jboolean colorMaskA, - jboolean depthMask, jboolean ditherEnable, - jint srcFunc, jint destFunc, - jint depthFunc) -{ - LOG_API("nProgramStoreCreate, con(%p)", con); - return (jint)rsProgramStoreCreate(con, colorMaskR, colorMaskG, colorMaskB, colorMaskA, - depthMask, ditherEnable, (RsBlendSrcFunc)srcFunc, - (RsBlendDstFunc)destFunc, (RsDepthFunc)depthFunc); -} - -// --------------------------------------------------------------------------- - -static void -nProgramBindConstants(JNIEnv *_env, jobject _this, RsContext con, jint vpv, jint slot, jint a) -{ - LOG_API("nProgramBindConstants, con(%p), vpf(%p), sloat(%i), a(%p)", con, (RsProgramVertex)vpv, slot, (RsAllocation)a); - rsProgramBindConstants(con, (RsProgram)vpv, slot, (RsAllocation)a); -} - -static void -nProgramBindTexture(JNIEnv *_env, jobject _this, RsContext con, jint vpf, jint slot, jint a) -{ - LOG_API("nProgramBindTexture, con(%p), vpf(%p), slot(%i), a(%p)", con, (RsProgramFragment)vpf, slot, (RsAllocation)a); - rsProgramBindTexture(con, (RsProgramFragment)vpf, slot, (RsAllocation)a); -} - -static void -nProgramBindSampler(JNIEnv *_env, jobject _this, RsContext con, jint vpf, jint slot, jint a) -{ - LOG_API("nProgramBindSampler, con(%p), vpf(%p), slot(%i), a(%p)", con, (RsProgramFragment)vpf, slot, (RsSampler)a); - rsProgramBindSampler(con, (RsProgramFragment)vpf, slot, (RsSampler)a); -} - -// --------------------------------------------------------------------------- - -static jint -nProgramFragmentCreate(JNIEnv *_env, jobject _this, RsContext con, jstring shader, - jobjectArray texNames, jintArray params) -{ - AutoJavaStringToUTF8 shaderUTF(_env, shader); - jint *paramPtr = _env->GetIntArrayElements(params, NULL); - jint paramLen = _env->GetArrayLength(params); - - int texCount = _env->GetArrayLength(texNames); - AutoJavaStringArrayToUTF8 names(_env, texNames, texCount); - const char ** nameArray = names.c_str(); - size_t* sizeArray = names.c_str_len(); - - LOG_API("nProgramFragmentCreate, con(%p), paramLen(%i)", con, paramLen); - - jint ret = (jint)rsProgramFragmentCreate(con, shaderUTF.c_str(), shaderUTF.length(), - nameArray, texCount, sizeArray, - (uint32_t *)paramPtr, paramLen); - - _env->ReleaseIntArrayElements(params, paramPtr, JNI_ABORT); - return ret; -} - - -// --------------------------------------------------------------------------- - -static jint -nProgramVertexCreate(JNIEnv *_env, jobject _this, RsContext con, jstring shader, - jobjectArray texNames, jintArray params) -{ - AutoJavaStringToUTF8 shaderUTF(_env, shader); - jint *paramPtr = _env->GetIntArrayElements(params, NULL); - jint paramLen = _env->GetArrayLength(params); - - LOG_API("nProgramVertexCreate, con(%p), paramLen(%i)", con, paramLen); - - int texCount = _env->GetArrayLength(texNames); - AutoJavaStringArrayToUTF8 names(_env, texNames, texCount); - const char ** nameArray = names.c_str(); - size_t* sizeArray = names.c_str_len(); - - jint ret = (jint)rsProgramVertexCreate(con, shaderUTF.c_str(), shaderUTF.length(), - nameArray, texCount, sizeArray, - (uint32_t *)paramPtr, paramLen); - - _env->ReleaseIntArrayElements(params, paramPtr, JNI_ABORT); - return ret; -} - -// --------------------------------------------------------------------------- - -static jint -nProgramRasterCreate(JNIEnv *_env, jobject _this, RsContext con, jboolean pointSprite, jint cull) -{ - LOG_API("nProgramRasterCreate, con(%p), pointSprite(%i), cull(%i)", con, pointSprite, cull); - return (jint)rsProgramRasterCreate(con, pointSprite, (RsCullMode)cull); -} - - -// --------------------------------------------------------------------------- - -static void -nContextBindRootScript(JNIEnv *_env, jobject _this, RsContext con, jint script) -{ - LOG_API("nContextBindRootScript, con(%p), script(%p)", con, (RsScript)script); - rsContextBindRootScript(con, (RsScript)script); -} - -static void -nContextBindProgramStore(JNIEnv *_env, jobject _this, RsContext con, jint pfs) -{ - LOG_API("nContextBindProgramStore, con(%p), pfs(%p)", con, (RsProgramStore)pfs); - rsContextBindProgramStore(con, (RsProgramStore)pfs); -} - -static void -nContextBindProgramFragment(JNIEnv *_env, jobject _this, RsContext con, jint pf) -{ - LOG_API("nContextBindProgramFragment, con(%p), pf(%p)", con, (RsProgramFragment)pf); - rsContextBindProgramFragment(con, (RsProgramFragment)pf); -} - -static void -nContextBindProgramVertex(JNIEnv *_env, jobject _this, RsContext con, jint pf) -{ - LOG_API("nContextBindProgramVertex, con(%p), pf(%p)", con, (RsProgramVertex)pf); - rsContextBindProgramVertex(con, (RsProgramVertex)pf); -} - -static void -nContextBindProgramRaster(JNIEnv *_env, jobject _this, RsContext con, jint pf) -{ - LOG_API("nContextBindProgramRaster, con(%p), pf(%p)", con, (RsProgramRaster)pf); - rsContextBindProgramRaster(con, (RsProgramRaster)pf); -} - - -// --------------------------------------------------------------------------- - -static jint -nSamplerCreate(JNIEnv *_env, jobject _this, RsContext con, jint magFilter, jint minFilter, - jint wrapS, jint wrapT, jint wrapR, jfloat aniso) -{ - LOG_API("nSamplerCreate, con(%p)", con); - return (jint)rsSamplerCreate(con, - (RsSamplerValue)magFilter, - (RsSamplerValue)minFilter, - (RsSamplerValue)wrapS, - (RsSamplerValue)wrapT, - (RsSamplerValue)wrapR, - aniso); -} - -// --------------------------------------------------------------------------- - -//native int rsnPathCreate(int con, int prim, boolean isStatic, int vtx, int loop, float q); -static jint -nPathCreate(JNIEnv *_env, jobject _this, RsContext con, jint prim, jboolean isStatic, jint _vtx, jint _loop, jfloat q) { - LOG_API("nPathCreate, con(%p)", con); - - int id = (int)rsPathCreate(con, (RsPathPrimitive)prim, isStatic, - (RsAllocation)_vtx, - (RsAllocation)_loop, q); - return id; -} - -static jint -nMeshCreate(JNIEnv *_env, jobject _this, RsContext con, jintArray _vtx, jintArray _idx, jintArray _prim) -{ - LOG_API("nMeshCreate, con(%p)", con); - - jint vtxLen = _env->GetArrayLength(_vtx); - jint *vtxPtr = _env->GetIntArrayElements(_vtx, NULL); - jint idxLen = _env->GetArrayLength(_idx); - jint *idxPtr = _env->GetIntArrayElements(_idx, NULL); - jint primLen = _env->GetArrayLength(_prim); - jint *primPtr = _env->GetIntArrayElements(_prim, NULL); - - int id = (int)rsMeshCreate(con, - (RsAllocation *)vtxPtr, vtxLen, - (RsAllocation *)idxPtr, idxLen, - (uint32_t *)primPtr, primLen); - - _env->ReleaseIntArrayElements(_vtx, vtxPtr, 0); - _env->ReleaseIntArrayElements(_idx, idxPtr, 0); - _env->ReleaseIntArrayElements(_prim, primPtr, 0); - return id; -} - -static jint -nMeshGetVertexBufferCount(JNIEnv *_env, jobject _this, RsContext con, jint mesh) -{ - LOG_API("nMeshGetVertexBufferCount, con(%p), Mesh(%p)", con, (RsMesh)mesh); - jint vtxCount = 0; - rsaMeshGetVertexBufferCount(con, (RsMesh)mesh, &vtxCount); - return vtxCount; -} - -static jint -nMeshGetIndexCount(JNIEnv *_env, jobject _this, RsContext con, jint mesh) -{ - LOG_API("nMeshGetIndexCount, con(%p), Mesh(%p)", con, (RsMesh)mesh); - jint idxCount = 0; - rsaMeshGetIndexCount(con, (RsMesh)mesh, &idxCount); - return idxCount; -} - -static void -nMeshGetVertices(JNIEnv *_env, jobject _this, RsContext con, jint mesh, jintArray _ids, int numVtxIDs) -{ - LOG_API("nMeshGetVertices, con(%p), Mesh(%p)", con, (RsMesh)mesh); - - RsAllocation *allocs = (RsAllocation*)malloc((uint32_t)numVtxIDs * sizeof(RsAllocation)); - rsaMeshGetVertices(con, (RsMesh)mesh, allocs, (uint32_t)numVtxIDs); - - for(jint i = 0; i < numVtxIDs; i ++) { - _env->SetIntArrayRegion(_ids, i, 1, (const jint*)&allocs[i]); - } - - free(allocs); -} - -static void -nMeshGetIndices(JNIEnv *_env, jobject _this, RsContext con, jint mesh, jintArray _idxIds, jintArray _primitives, int numIndices) -{ - LOG_API("nMeshGetVertices, con(%p), Mesh(%p)", con, (RsMesh)mesh); - - RsAllocation *allocs = (RsAllocation*)malloc((uint32_t)numIndices * sizeof(RsAllocation)); - uint32_t *prims= (uint32_t*)malloc((uint32_t)numIndices * sizeof(uint32_t)); - - rsaMeshGetIndices(con, (RsMesh)mesh, allocs, prims, (uint32_t)numIndices); - - for(jint i = 0; i < numIndices; i ++) { - _env->SetIntArrayRegion(_idxIds, i, 1, (const jint*)&allocs[i]); - _env->SetIntArrayRegion(_primitives, i, 1, (const jint*)&prims[i]); - } - - free(allocs); - free(prims); -} - -// --------------------------------------------------------------------------- - - -static const char *classPathName = "android/renderscript/RenderScript"; - -static JNINativeMethod methods[] = { -{"_nInit", "()V", (void*)_nInit }, - -{"nDeviceCreate", "()I", (void*)nDeviceCreate }, -{"nDeviceDestroy", "(I)V", (void*)nDeviceDestroy }, -{"nDeviceSetConfig", "(III)V", (void*)nDeviceSetConfig }, -{"nContextGetUserMessage", "(I[I)I", (void*)nContextGetUserMessage }, -{"nContextGetErrorMessage", "(I)Ljava/lang/String;", (void*)nContextGetErrorMessage }, -{"nContextPeekMessage", "(I[I)I", (void*)nContextPeekMessage }, - -{"nContextInitToClient", "(I)V", (void*)nContextInitToClient }, -{"nContextDeinitToClient", "(I)V", (void*)nContextDeinitToClient }, - - -// All methods below are thread protected in java. -{"rsnContextCreate", "(IIII)I", (void*)nContextCreate }, -{"rsnContextCreateGL", "(IIIIIIIIIIIIIFI)I", (void*)nContextCreateGL }, -{"rsnContextFinish", "(I)V", (void*)nContextFinish }, -{"rsnContextSetPriority", "(II)V", (void*)nContextSetPriority }, -{"rsnContextSetSurface", "(IIILandroid/view/Surface;)V", (void*)nContextSetSurface }, -{"rsnContextDestroy", "(I)V", (void*)nContextDestroy }, -{"rsnContextDump", "(II)V", (void*)nContextDump }, -{"rsnContextPause", "(I)V", (void*)nContextPause }, -{"rsnContextResume", "(I)V", (void*)nContextResume }, -{"rsnContextSendMessage", "(II[I)V", (void*)nContextSendMessage }, -{"rsnAssignName", "(II[B)V", (void*)nAssignName }, -{"rsnGetName", "(II)Ljava/lang/String;", (void*)nGetName }, -{"rsnObjDestroy", "(II)V", (void*)nObjDestroy }, - -{"rsnFileA3DCreateFromFile", "(ILjava/lang/String;)I", (void*)nFileA3DCreateFromFile }, -{"rsnFileA3DCreateFromAssetStream", "(II)I", (void*)nFileA3DCreateFromAssetStream }, -{"rsnFileA3DCreateFromAsset", "(ILandroid/content/res/AssetManager;Ljava/lang/String;)I", (void*)nFileA3DCreateFromAsset }, -{"rsnFileA3DGetNumIndexEntries", "(II)I", (void*)nFileA3DGetNumIndexEntries }, -{"rsnFileA3DGetIndexEntries", "(III[I[Ljava/lang/String;)V", (void*)nFileA3DGetIndexEntries }, -{"rsnFileA3DGetEntryByIndex", "(III)I", (void*)nFileA3DGetEntryByIndex }, - -{"rsnFontCreateFromFile", "(ILjava/lang/String;FI)I", (void*)nFontCreateFromFile }, -{"rsnFontCreateFromAssetStream", "(ILjava/lang/String;FII)I", (void*)nFontCreateFromAssetStream }, -{"rsnFontCreateFromAsset", "(ILandroid/content/res/AssetManager;Ljava/lang/String;FI)I", (void*)nFontCreateFromAsset }, - -{"rsnElementCreate", "(IIIZI)I", (void*)nElementCreate }, -{"rsnElementCreate2", "(I[I[Ljava/lang/String;[I)I", (void*)nElementCreate2 }, -{"rsnElementGetNativeData", "(II[I)V", (void*)nElementGetNativeData }, -{"rsnElementGetSubElements", "(II[I[Ljava/lang/String;[I)V", (void*)nElementGetSubElements }, - -{"rsnTypeCreate", "(IIIIIZZI)I", (void*)nTypeCreate }, -{"rsnTypeGetNativeData", "(II[I)V", (void*)nTypeGetNativeData }, - -{"rsnAllocationCreateTyped", "(IIIII)I", (void*)nAllocationCreateTyped }, -{"rsnAllocationCreateFromBitmap", "(IIILandroid/graphics/Bitmap;I)I", (void*)nAllocationCreateFromBitmap }, -{"rsnAllocationCreateBitmapBackedAllocation", "(IIILandroid/graphics/Bitmap;I)I", (void*)nAllocationCreateBitmapBackedAllocation }, -{"rsnAllocationCubeCreateFromBitmap","(IIILandroid/graphics/Bitmap;I)I", (void*)nAllocationCubeCreateFromBitmap }, - -{"rsnAllocationCopyFromBitmap", "(IILandroid/graphics/Bitmap;)V", (void*)nAllocationCopyFromBitmap }, -{"rsnAllocationCopyToBitmap", "(IILandroid/graphics/Bitmap;)V", (void*)nAllocationCopyToBitmap }, - -{"rsnAllocationSyncAll", "(III)V", (void*)nAllocationSyncAll }, -{"rsnAllocationGetSurface", "(II)Landroid/view/Surface;", (void*)nAllocationGetSurface }, -{"rsnAllocationSetSurface", "(IILandroid/view/Surface;)V", (void*)nAllocationSetSurface }, -{"rsnAllocationIoSend", "(II)V", (void*)nAllocationIoSend }, -{"rsnAllocationIoReceive", "(II)V", (void*)nAllocationIoReceive }, -{"rsnAllocationData1D", "(IIIII[II)V", (void*)nAllocationData1D_i }, -{"rsnAllocationData1D", "(IIIII[SI)V", (void*)nAllocationData1D_s }, -{"rsnAllocationData1D", "(IIIII[BI)V", (void*)nAllocationData1D_b }, -{"rsnAllocationData1D", "(IIIII[FI)V", (void*)nAllocationData1D_f }, -{"rsnAllocationElementData1D", "(IIIII[BI)V", (void*)nAllocationElementData1D }, -{"rsnAllocationData2D", "(IIIIIIII[II)V", (void*)nAllocationData2D_i }, -{"rsnAllocationData2D", "(IIIIIIII[SI)V", (void*)nAllocationData2D_s }, -{"rsnAllocationData2D", "(IIIIIIII[BI)V", (void*)nAllocationData2D_b }, -{"rsnAllocationData2D", "(IIIIIIII[FI)V", (void*)nAllocationData2D_f }, -{"rsnAllocationData2D", "(IIIIIIIIIIIII)V", (void*)nAllocationData2D_alloc }, -{"rsnAllocationData3D", "(IIIIIIIII[II)V", (void*)nAllocationData3D_i }, -{"rsnAllocationData3D", "(IIIIIIIII[SI)V", (void*)nAllocationData3D_s }, -{"rsnAllocationData3D", "(IIIIIIIII[BI)V", (void*)nAllocationData3D_b }, -{"rsnAllocationData3D", "(IIIIIIIII[FI)V", (void*)nAllocationData3D_f }, -{"rsnAllocationData3D", "(IIIIIIIIIIIIII)V", (void*)nAllocationData3D_alloc }, -{"rsnAllocationRead", "(II[I)V", (void*)nAllocationRead_i }, -{"rsnAllocationRead", "(II[S)V", (void*)nAllocationRead_s }, -{"rsnAllocationRead", "(II[B)V", (void*)nAllocationRead_b }, -{"rsnAllocationRead", "(II[F)V", (void*)nAllocationRead_f }, -{"rsnAllocationGetType", "(II)I", (void*)nAllocationGetType}, -{"rsnAllocationResize1D", "(III)V", (void*)nAllocationResize1D }, -{"rsnAllocationGenerateMipmaps", "(II)V", (void*)nAllocationGenerateMipmaps }, - -{"rsnScriptBindAllocation", "(IIII)V", (void*)nScriptBindAllocation }, -{"rsnScriptSetTimeZone", "(II[B)V", (void*)nScriptSetTimeZone }, -{"rsnScriptInvoke", "(III)V", (void*)nScriptInvoke }, -{"rsnScriptInvokeV", "(III[B)V", (void*)nScriptInvokeV }, -{"rsnScriptForEach", "(IIIII)V", (void*)nScriptForEach }, -{"rsnScriptForEach", "(IIIII[B)V", (void*)nScriptForEachV }, -{"rsnScriptForEachClipped", "(IIIIIIIIIII)V", (void*)nScriptForEachClipped }, -{"rsnScriptForEachClipped", "(IIIII[BIIIIII)V", (void*)nScriptForEachClippedV }, -{"rsnScriptSetVarI", "(IIII)V", (void*)nScriptSetVarI }, -{"rsnScriptGetVarI", "(III)I", (void*)nScriptGetVarI }, -{"rsnScriptSetVarJ", "(IIIJ)V", (void*)nScriptSetVarJ }, -{"rsnScriptGetVarJ", "(III)J", (void*)nScriptGetVarJ }, -{"rsnScriptSetVarF", "(IIIF)V", (void*)nScriptSetVarF }, -{"rsnScriptGetVarF", "(III)F", (void*)nScriptGetVarF }, -{"rsnScriptSetVarD", "(IIID)V", (void*)nScriptSetVarD }, -{"rsnScriptGetVarD", "(III)D", (void*)nScriptGetVarD }, -{"rsnScriptSetVarV", "(III[B)V", (void*)nScriptSetVarV }, -{"rsnScriptGetVarV", "(III[B)V", (void*)nScriptGetVarV }, -{"rsnScriptSetVarVE", "(III[BI[I)V", (void*)nScriptSetVarVE }, -{"rsnScriptSetVarObj", "(IIII)V", (void*)nScriptSetVarObj }, - -{"rsnScriptCCreate", "(ILjava/lang/String;Ljava/lang/String;[BI)I", (void*)nScriptCCreate }, -{"rsnScriptIntrinsicCreate", "(III)I", (void*)nScriptIntrinsicCreate }, -{"rsnScriptKernelIDCreate", "(IIII)I", (void*)nScriptKernelIDCreate }, -{"rsnScriptFieldIDCreate", "(III)I", (void*)nScriptFieldIDCreate }, -{"rsnScriptGroupCreate", "(I[I[I[I[I[I)I", (void*)nScriptGroupCreate }, -{"rsnScriptGroupSetInput", "(IIII)V", (void*)nScriptGroupSetInput }, -{"rsnScriptGroupSetOutput", "(IIII)V", (void*)nScriptGroupSetOutput }, -{"rsnScriptGroupExecute", "(II)V", (void*)nScriptGroupExecute }, - -{"rsnProgramStoreCreate", "(IZZZZZZIII)I", (void*)nProgramStoreCreate }, - -{"rsnProgramBindConstants", "(IIII)V", (void*)nProgramBindConstants }, -{"rsnProgramBindTexture", "(IIII)V", (void*)nProgramBindTexture }, -{"rsnProgramBindSampler", "(IIII)V", (void*)nProgramBindSampler }, - -{"rsnProgramFragmentCreate", "(ILjava/lang/String;[Ljava/lang/String;[I)I", (void*)nProgramFragmentCreate }, -{"rsnProgramRasterCreate", "(IZI)I", (void*)nProgramRasterCreate }, -{"rsnProgramVertexCreate", "(ILjava/lang/String;[Ljava/lang/String;[I)I", (void*)nProgramVertexCreate }, - -{"rsnContextBindRootScript", "(II)V", (void*)nContextBindRootScript }, -{"rsnContextBindProgramStore", "(II)V", (void*)nContextBindProgramStore }, -{"rsnContextBindProgramFragment", "(II)V", (void*)nContextBindProgramFragment }, -{"rsnContextBindProgramVertex", "(II)V", (void*)nContextBindProgramVertex }, -{"rsnContextBindProgramRaster", "(II)V", (void*)nContextBindProgramRaster }, - -{"rsnSamplerCreate", "(IIIIIIF)I", (void*)nSamplerCreate }, - -{"rsnPathCreate", "(IIZIIF)I", (void*)nPathCreate }, -{"rsnMeshCreate", "(I[I[I[I)I", (void*)nMeshCreate }, - -{"rsnMeshGetVertexBufferCount", "(II)I", (void*)nMeshGetVertexBufferCount }, -{"rsnMeshGetIndexCount", "(II)I", (void*)nMeshGetIndexCount }, -{"rsnMeshGetVertices", "(II[II)V", (void*)nMeshGetVertices }, -{"rsnMeshGetIndices", "(II[I[II)V", (void*)nMeshGetIndices }, - -}; - -static int registerFuncs(JNIEnv *_env) -{ - return android::AndroidRuntime::registerNativeMethods( - _env, classPathName, methods, NELEM(methods)); -} - -// --------------------------------------------------------------------------- - -jint JNI_OnLoad(JavaVM* vm, void* reserved) -{ - JNIEnv* env = NULL; - jint result = -1; - - if (vm->GetEnv((void**) &env, JNI_VERSION_1_4) != JNI_OK) { - ALOGE("ERROR: GetEnv failed\n"); - goto bail; - } - assert(env != NULL); - - if (registerFuncs(env) < 0) { - ALOGE("ERROR: MediaPlayer native registration failed\n"); - goto bail; - } - - /* success -- return valid version number */ - result = JNI_VERSION_1_4; - -bail: - return result; -} diff --git a/include/androidfw/AssetManager.h b/include/androidfw/AssetManager.h index a010957..a13dd16 100644 --- a/include/androidfw/AssetManager.h +++ b/include/androidfw/AssetManager.h @@ -69,6 +69,13 @@ struct ResTable_config; */ class AssetManager : public AAssetManager { public: + static const char* RESOURCES_FILENAME; + static const char* IDMAP_BIN; + static const char* OVERLAY_DIR; + static const char* TARGET_PACKAGE_NAME; + static const char* TARGET_APK_PATH; + static const char* IDMAP_DIR; + typedef enum CacheMode { CACHE_UNKNOWN = 0, CACHE_OFF, // don't try to cache file locations @@ -93,6 +100,7 @@ public: * newly-added asset source. */ bool addAssetPath(const String8& path, int32_t* cookie); + bool addOverlayPath(const String8& path, int32_t* cookie); /* * Convenience for adding the standard system assets. Uses the @@ -218,6 +226,13 @@ public: */ void getLocales(Vector<String8>* locales) const; + /** + * Generate idmap data to translate resources IDs between a package and a + * corresponding overlay package. + */ + bool createIdmap(const char* targetApkPath, const char* overlayApkPath, + uint32_t targetCrc, uint32_t overlayCrc, uint32_t** outData, size_t* outSize); + private: struct asset_path { @@ -264,19 +279,14 @@ private: void setLocaleLocked(const char* locale); void updateResourceParamsLocked() const; - bool createIdmapFileLocked(const String8& originalPath, const String8& overlayPath, - const String8& idmapPath); - - bool isIdmapStaleLocked(const String8& originalPath, const String8& overlayPath, - const String8& idmapPath); - Asset* openIdmapLocked(const struct asset_path& ap) const; - bool getZipEntryCrcLocked(const String8& zipPath, const char* entryFilename, uint32_t* pCrc); + void addSystemOverlays(const char* pathOverlaysList, const String8& targetPackagePath, + ResTable* sharedRes, size_t offset) const; class SharedZip : public RefBase { public: - static sp<SharedZip> get(const String8& path); + static sp<SharedZip> get(const String8& path, bool createIfNotPresent = true); ZipFileRO* getZip(); @@ -287,6 +297,9 @@ private: ResTable* setResourceTable(ResTable* res); bool isUpToDate(); + + void addOverlay(const asset_path& ap); + bool getOverlay(size_t idx, asset_path* out) const; protected: ~SharedZip(); @@ -302,6 +315,8 @@ private: Asset* mResourceTableAsset; ResTable* mResourceTable; + Vector<asset_path> mOverlays; + static Mutex gLock; static DefaultKeyedVector<String8, wp<SharedZip> > gOpen; }; @@ -334,6 +349,9 @@ private: static String8 getPathName(const char* path); bool isUpToDate(); + + void addOverlay(const String8& path, const asset_path& overlay); + bool getOverlay(const String8& path, size_t idx, asset_path* out) const; private: void closeZip(int idx); diff --git a/include/androidfw/ResourceTypes.h b/include/androidfw/ResourceTypes.h index 5151b06..05411ea 100644 --- a/include/androidfw/ResourceTypes.h +++ b/include/androidfw/ResourceTypes.h @@ -1279,14 +1279,13 @@ class ResTable { public: ResTable(); - ResTable(const void* data, size_t size, void* cookie, + ResTable(const void* data, size_t size, const int32_t cookie, bool copyData=false); ~ResTable(); - status_t add(const void* data, size_t size, void* cookie, - bool copyData=false, const void* idmap = NULL); - status_t add(Asset* asset, void* cookie, - bool copyData=false, const void* idmap = NULL); + status_t add(Asset* asset, const int32_t cookie, bool copyData, + const void* idmap = NULL); + status_t add(const void *data, size_t size); status_t add(ResTable* src); status_t getError() const; @@ -1534,7 +1533,7 @@ public: // but not the names their entries or types. const ResStringPool* getTableStringBlock(size_t index) const; // Return unique cookie identifier for the given resource table. - void* getTableCookie(size_t index) const; + int32_t getTableCookie(size_t index) const; // Return the configurations (ResTable_config) that we know about void getConfigurations(Vector<ResTable_config>* configs) const; @@ -1546,18 +1545,21 @@ public: // Return value: on success: NO_ERROR; caller is responsible for free-ing // outData (using free(3)). On failure, any status_t value other than // NO_ERROR; the caller should not free outData. - status_t createIdmap(const ResTable& overlay, uint32_t originalCrc, uint32_t overlayCrc, - void** outData, size_t* outSize) const; + status_t createIdmap(const ResTable& overlay, + uint32_t targetCrc, uint32_t overlayCrc, + const char* targetPath, const char* overlayPath, + void** outData, size_t* outSize) const; enum { - IDMAP_HEADER_SIZE_BYTES = 3 * sizeof(uint32_t), + IDMAP_HEADER_SIZE_BYTES = 3 * sizeof(uint32_t) + 2 * 256, }; // Retrieve idmap meta-data. // // This function only requires the idmap header (the first // IDMAP_HEADER_SIZE_BYTES) bytes of an idmap file. static bool getIdmapInfo(const void* idmap, size_t size, - uint32_t* pOriginalCrc, uint32_t* pOverlayCrc); + uint32_t* pTargetCrc, uint32_t* pOverlayCrc, + String8* pTargetPath, String8* pOverlayPath); void print(bool inclValues) const; static String8 normalizeForOutput(const char* input); @@ -1569,7 +1571,7 @@ private: struct PackageGroup; struct bag_set; - status_t add(const void* data, size_t size, void* cookie, + status_t addInternal(const void* data, size_t size, const int32_t cookie, Asset* asset, bool copyData, const Asset* idmap); ssize_t getResourcePackageIndex(uint32_t resID) const; diff --git a/libs/androidfw/AssetManager.cpp b/libs/androidfw/AssetManager.cpp index 52ab361..5069958 100644 --- a/libs/androidfw/AssetManager.cpp +++ b/libs/androidfw/AssetManager.cpp @@ -41,10 +41,8 @@ #include <assert.h> #include <dirent.h> #include <errno.h> -#include <fcntl.h> +#include <string.h> // strerror #include <strings.h> -#include <sys/stat.h> -#include <unistd.h> #ifndef TEMP_FAILURE_RETRY /* Used to retry syscalls that can return EINTR. */ @@ -75,7 +73,7 @@ static const char* kDefaultVendor = "default"; static const char* kAssetsRoot = "assets"; static const char* kAppZipName = NULL; //"classes.jar"; static const char* kSystemAssets = "framework/framework-res.apk"; -static const char* kIdmapCacheDir = "resource-cache"; +static const char* kResourceCache = "resource-cache"; static const char* kExcludeExtension = ".EXCLUDE"; @@ -83,14 +81,20 @@ static Asset* const kExcludedAsset = (Asset*) 0xd000000d; static volatile int32_t gCount = 0; +const char* AssetManager::RESOURCES_FILENAME = "resources.arsc"; +const char* AssetManager::IDMAP_BIN = "/system/bin/idmap"; +const char* AssetManager::OVERLAY_DIR = "/vendor/overlay"; +const char* AssetManager::TARGET_PACKAGE_NAME = "android"; +const char* AssetManager::TARGET_APK_PATH = "/system/framework/framework-res.apk"; +const char* AssetManager::IDMAP_DIR = "/data/resource-cache"; + namespace { - // Transform string /a/b/c.apk to /data/resource-cache/a@b@c.apk@idmap String8 idmapPathForPackagePath(const String8& pkgPath) { const char* root = getenv("ANDROID_DATA"); LOG_ALWAYS_FATAL_IF(root == NULL, "ANDROID_DATA not set"); String8 path(root); - path.appendPath(kIdmapCacheDir); + path.appendPath(kResourceCache); char buf[256]; // 256 chars should be enough for anyone... strncpy(buf, pkgPath.string(), 255); @@ -208,180 +212,99 @@ bool AssetManager::addAssetPath(const String8& path, int32_t* cookie) *cookie = static_cast<int32_t>(mAssetPaths.size()); } - // add overlay packages for /system/framework; apps are handled by the - // (Java) package manager - if (strncmp(path.string(), "/system/framework/", 18) == 0) { - // When there is an environment variable for /vendor, this - // should be changed to something similar to how ANDROID_ROOT - // and ANDROID_DATA are used in this file. - String8 overlayPath("/vendor/overlay/framework/"); - overlayPath.append(path.getPathLeaf()); - if (TEMP_FAILURE_RETRY(access(overlayPath.string(), R_OK)) == 0) { - asset_path oap; - oap.path = overlayPath; - oap.type = ::getFileType(overlayPath.string()); - bool addOverlay = (oap.type == kFileTypeRegular); // only .apks supported as overlay - if (addOverlay) { - oap.idmap = idmapPathForPackagePath(overlayPath); - - if (isIdmapStaleLocked(ap.path, oap.path, oap.idmap)) { - addOverlay = createIdmapFileLocked(ap.path, oap.path, oap.idmap); - } - } - if (addOverlay) { - mAssetPaths.add(oap); - } else { - ALOGW("failed to add overlay package %s\n", overlayPath.string()); - } - } +#ifdef HAVE_ANDROID_OS + // Load overlays, if any + asset_path oap; + for (size_t idx = 0; mZipSet.getOverlay(ap.path, idx, &oap); idx++) { + mAssetPaths.add(oap); } +#endif return true; } -bool AssetManager::isIdmapStaleLocked(const String8& originalPath, const String8& overlayPath, - const String8& idmapPath) +bool AssetManager::addOverlayPath(const String8& packagePath, int32_t* cookie) { - struct stat st; - if (TEMP_FAILURE_RETRY(stat(idmapPath.string(), &st)) == -1) { - if (errno == ENOENT) { - return true; // non-existing idmap is always stale - } else { - ALOGW("failed to stat file %s: %s\n", idmapPath.string(), strerror(errno)); - return false; - } - } - if (st.st_size < ResTable::IDMAP_HEADER_SIZE_BYTES) { - ALOGW("file %s has unexpectedly small size=%zd\n", idmapPath.string(), (size_t)st.st_size); - return false; - } - int fd = TEMP_FAILURE_RETRY(::open(idmapPath.string(), O_RDONLY)); - if (fd == -1) { - ALOGW("failed to open file %s: %s\n", idmapPath.string(), strerror(errno)); + const String8 idmapPath = idmapPathForPackagePath(packagePath); + + AutoMutex _l(mLock); + + for (size_t i = 0; i < mAssetPaths.size(); ++i) { + if (mAssetPaths[i].idmap == idmapPath) { + *cookie = static_cast<int32_t>(i + 1); + return true; + } + } + + Asset* idmap = NULL; + if ((idmap = openAssetFromFileLocked(idmapPath, Asset::ACCESS_BUFFER)) == NULL) { + ALOGW("failed to open idmap file %s\n", idmapPath.string()); return false; } - char buf[ResTable::IDMAP_HEADER_SIZE_BYTES]; - ssize_t bytesLeft = ResTable::IDMAP_HEADER_SIZE_BYTES; - for (;;) { - ssize_t r = TEMP_FAILURE_RETRY(read(fd, buf + ResTable::IDMAP_HEADER_SIZE_BYTES - bytesLeft, - bytesLeft)); - if (r < 0) { - TEMP_FAILURE_RETRY(close(fd)); - return false; - } - bytesLeft -= r; - if (bytesLeft == 0) { - break; - } - } - TEMP_FAILURE_RETRY(close(fd)); - uint32_t cachedOriginalCrc, cachedOverlayCrc; - if (!ResTable::getIdmapInfo(buf, ResTable::IDMAP_HEADER_SIZE_BYTES, - &cachedOriginalCrc, &cachedOverlayCrc)) { + String8 targetPath; + String8 overlayPath; + if (!ResTable::getIdmapInfo(idmap->getBuffer(false), idmap->getLength(), + NULL, NULL, &targetPath, &overlayPath)) { + ALOGW("failed to read idmap file %s\n", idmapPath.string()); + delete idmap; return false; } + delete idmap; - uint32_t actualOriginalCrc, actualOverlayCrc; - if (!getZipEntryCrcLocked(originalPath, "resources.arsc", &actualOriginalCrc)) { + if (overlayPath != packagePath) { + ALOGW("idmap file %s inconcistent: expected path %s does not match actual path %s\n", + idmapPath.string(), packagePath.string(), overlayPath.string()); return false; } - if (!getZipEntryCrcLocked(overlayPath, "resources.arsc", &actualOverlayCrc)) { + if (access(targetPath.string(), R_OK) != 0) { + ALOGW("failed to access file %s: %s\n", targetPath.string(), strerror(errno)); return false; } - return cachedOriginalCrc != actualOriginalCrc || cachedOverlayCrc != actualOverlayCrc; -} - -bool AssetManager::getZipEntryCrcLocked(const String8& zipPath, const char* entryFilename, - uint32_t* pCrc) -{ - asset_path ap; - ap.path = zipPath; - const ZipFileRO* zip = getZipFileLocked(ap); - if (zip == NULL) { + if (access(idmapPath.string(), R_OK) != 0) { + ALOGW("failed to access file %s: %s\n", idmapPath.string(), strerror(errno)); return false; } - const ZipEntryRO entry = zip->findEntryByName(entryFilename); - if (entry == NULL) { + if (access(overlayPath.string(), R_OK) != 0) { + ALOGW("failed to access file %s: %s\n", overlayPath.string(), strerror(errno)); return false; } - const bool gotInfo = zip->getEntryInfo(entry, NULL, NULL, NULL, NULL, NULL, (long*)pCrc); - zip->releaseEntry(entry); + asset_path oap; + oap.path = overlayPath; + oap.type = ::getFileType(overlayPath.string()); + oap.idmap = idmapPath; +#if 0 + ALOGD("Overlay added: targetPath=%s overlayPath=%s idmapPath=%s\n", + targetPath.string(), overlayPath.string(), idmapPath.string()); +#endif + mAssetPaths.add(oap); + *cookie = static_cast<int32_t>(mAssetPaths.size()); - return gotInfo; -} + return true; + } -bool AssetManager::createIdmapFileLocked(const String8& originalPath, const String8& overlayPath, - const String8& idmapPath) +bool AssetManager::createIdmap(const char* targetApkPath, const char* overlayApkPath, + uint32_t targetCrc, uint32_t overlayCrc, uint32_t** outData, size_t* outSize) { - ALOGD("%s: originalPath=%s overlayPath=%s idmapPath=%s\n", - __FUNCTION__, originalPath.string(), overlayPath.string(), idmapPath.string()); + AutoMutex _l(mLock); + const String8 paths[2] = { String8(targetApkPath), String8(overlayApkPath) }; ResTable tables[2]; - const String8* paths[2] = { &originalPath, &overlayPath }; - uint32_t originalCrc, overlayCrc; - bool retval = false; - ssize_t offset = 0; - int fd = 0; - uint32_t* data = NULL; - size_t size; for (int i = 0; i < 2; ++i) { asset_path ap; ap.type = kFileTypeRegular; - ap.path = *paths[i]; + ap.path = paths[i]; Asset* ass = openNonAssetInPathLocked("resources.arsc", Asset::ACCESS_BUFFER, ap); if (ass == NULL) { ALOGW("failed to find resources.arsc in %s\n", ap.path.string()); - goto error; - } - tables[i].add(ass, (void*)1, false); - } - - if (!getZipEntryCrcLocked(originalPath, "resources.arsc", &originalCrc)) { - ALOGW("failed to retrieve crc for resources.arsc in %s\n", originalPath.string()); - goto error; - } - if (!getZipEntryCrcLocked(overlayPath, "resources.arsc", &overlayCrc)) { - ALOGW("failed to retrieve crc for resources.arsc in %s\n", overlayPath.string()); - goto error; - } - - if (tables[0].createIdmap(tables[1], originalCrc, overlayCrc, - (void**)&data, &size) != NO_ERROR) { - ALOGW("failed to generate idmap data for file %s\n", idmapPath.string()); - goto error; - } - - // This should be abstracted (eg replaced by a stand-alone - // application like dexopt, triggered by something equivalent to - // installd). - fd = TEMP_FAILURE_RETRY(::open(idmapPath.string(), O_WRONLY | O_CREAT | O_TRUNC, 0644)); - if (fd == -1) { - ALOGW("failed to write idmap file %s (open: %s)\n", idmapPath.string(), strerror(errno)); - goto error_free; - } - for (;;) { - ssize_t written = TEMP_FAILURE_RETRY(write(fd, data + offset, size)); - if (written < 0) { - ALOGW("failed to write idmap file %s (write: %s)\n", idmapPath.string(), - strerror(errno)); - goto error_close; - } - size -= (size_t)written; - offset += written; - if (size == 0) { - break; + return false; } + tables[i].add(ass, 1, false /* copyData */, NULL /* idMap */); } - retval = true; -error_close: - TEMP_FAILURE_RETRY(close(fd)); -error_free: - free(data); -error: - return retval; + return tables[0].createIdmap(tables[1], targetCrc, overlayCrc, + targetApkPath, overlayApkPath, (void**)outData, outSize) == NO_ERROR; } bool AssetManager::addDefaultAssets() @@ -660,6 +583,10 @@ const ResTable* AssetManager::getResTable(bool required) const // which we want to avoid parsing every time. sharedRes = const_cast<AssetManager*>(this)-> mZipSet.getZipResourceTable(ap.path); + if (sharedRes != NULL) { + // skip ahead the number of system overlay packages preloaded + i += sharedRes->getTableCount() - 1; + } } if (sharedRes == NULL) { ass = const_cast<AssetManager*>(this)-> @@ -682,7 +609,15 @@ const ResTable* AssetManager::getResTable(bool required) const // can quickly copy it out for others. ALOGV("Creating shared resources for %s", ap.path.string()); sharedRes = new ResTable(); - sharedRes->add(ass, (void*)(i+1), false, idmap); + sharedRes->add(ass, i + 1, false, idmap); +#ifdef HAVE_ANDROID_OS + const char* data = getenv("ANDROID_DATA"); + LOG_ALWAYS_FATAL_IF(data == NULL, "ANDROID_DATA not set"); + String8 overlaysListPath(data); + overlaysListPath.appendPath(kResourceCache); + overlaysListPath.appendPath("overlays.list"); + addSystemOverlays(overlaysListPath.string(), ap.path, sharedRes, i); +#endif sharedRes = const_cast<AssetManager*>(this)-> mZipSet.setZipResourceTable(ap.path, sharedRes); } @@ -706,7 +641,7 @@ const ResTable* AssetManager::getResTable(bool required) const rt->add(sharedRes); } else { ALOGV("Parsing resources for %s", ap.path.string()); - rt->add(ass, (void*)(i+1), !shared, idmap); + rt->add(ass, i + 1, !shared, idmap); } if (!shared) { @@ -766,6 +701,46 @@ Asset* AssetManager::openIdmapLocked(const struct asset_path& ap) const return ass; } +void AssetManager::addSystemOverlays(const char* pathOverlaysList, + const String8& targetPackagePath, ResTable* sharedRes, size_t offset) const +{ + FILE* fin = fopen(pathOverlaysList, "r"); + if (fin == NULL) { + return; + } + + char buf[1024]; + while (fgets(buf, sizeof(buf), fin)) { + // format of each line: + // <path to apk><space><path to idmap><newline> + char* space = strchr(buf, ' '); + char* newline = strchr(buf, '\n'); + asset_path oap; + + if (space == NULL || newline == NULL || newline < space) { + continue; + } + + oap.path = String8(buf, space - buf); + oap.type = kFileTypeRegular; + oap.idmap = String8(space + 1, newline - space - 1); + + Asset* oass = const_cast<AssetManager*>(this)-> + openNonAssetInPathLocked("resources.arsc", + Asset::ACCESS_BUFFER, + oap); + + if (oass != NULL) { + Asset* oidmap = openIdmapLocked(oap); + offset++; + sharedRes->add(oass, offset + 1, false, oidmap); + const_cast<AssetManager*>(this)->mAssetPaths.add(oap); + const_cast<AssetManager*>(this)->mZipSet.addOverlay(targetPackagePath, oap); + } + } + fclose(fin); +} + const ResTable& AssetManager::getResources(bool required) const { const ResTable* rt = getResTable(required); @@ -1824,7 +1799,8 @@ AssetManager::SharedZip::SharedZip(const String8& path, time_t modWhen) } } -sp<AssetManager::SharedZip> AssetManager::SharedZip::get(const String8& path) +sp<AssetManager::SharedZip> AssetManager::SharedZip::get(const String8& path, + bool createIfNotPresent) { AutoMutex _l(gLock); time_t modWhen = getFileModDate(path); @@ -1832,6 +1808,9 @@ sp<AssetManager::SharedZip> AssetManager::SharedZip::get(const String8& path) if (zip != NULL && zip->mModWhen == modWhen) { return zip; } + if (zip == NULL && !createIfNotPresent) { + return NULL; + } zip = new SharedZip(path, modWhen); gOpen.add(path, zip); return zip; @@ -1890,6 +1869,20 @@ bool AssetManager::SharedZip::isUpToDate() return mModWhen == modWhen; } +void AssetManager::SharedZip::addOverlay(const asset_path& ap) +{ + mOverlays.add(ap); +} + +bool AssetManager::SharedZip::getOverlay(size_t idx, asset_path* out) const +{ + if (idx >= mOverlays.size()) { + return false; + } + *out = mOverlays[idx]; + return true; +} + AssetManager::SharedZip::~SharedZip() { //ALOGI("Destroying SharedZip %p %s\n", this, (const char*)mPath); @@ -2013,6 +2006,22 @@ bool AssetManager::ZipSet::isUpToDate() return true; } +void AssetManager::ZipSet::addOverlay(const String8& path, const asset_path& overlay) +{ + int idx = getIndex(path); + sp<SharedZip> zip = mZipFile[idx]; + zip->addOverlay(overlay); +} + +bool AssetManager::ZipSet::getOverlay(const String8& path, size_t idx, asset_path* out) const +{ + sp<SharedZip> zip = SharedZip::get(path, false); + if (zip == NULL) { + return false; + } + return zip->getOverlay(idx, out); +} + /* * Compute the zip file's index. * diff --git a/libs/androidfw/ResourceTypes.cpp b/libs/androidfw/ResourceTypes.cpp index 1cc3563..8cc98af 100644 --- a/libs/androidfw/ResourceTypes.cpp +++ b/libs/androidfw/ResourceTypes.cpp @@ -66,9 +66,9 @@ namespace android { // size measured in sizeof(uint32_t) #define IDMAP_HEADER_SIZE (ResTable::IDMAP_HEADER_SIZE_BYTES / sizeof(uint32_t)) -static void printToLogFunc(void* cookie, const char* txt) +static void printToLogFunc(int32_t cookie, const char* txt) { - ALOGV("%s", txt); + ALOGV("[cookie=%d] %s", cookie, txt); } // Standard C isspace() is only required to look at the low byte of its input, so @@ -284,11 +284,37 @@ static status_t getIdmapPackageId(const uint32_t* map, size_t mapSize, uint32_t if (!assertIdmapHeader(map, mapSize)) { return UNKNOWN_ERROR; } + if (mapSize <= IDMAP_HEADER_SIZE + 1) { + ALOGW("corrupt idmap: map size %d too short\n", mapSize); + return UNKNOWN_ERROR; + } + uint32_t typeCount = *(map + IDMAP_HEADER_SIZE); + if (typeCount == 0) { + ALOGW("corrupt idmap: no types\n"); + return UNKNOWN_ERROR; + } + if (IDMAP_HEADER_SIZE + 1 + typeCount > mapSize) { + ALOGW("corrupt idmap: number of types %d extends past idmap size %d\n", typeCount, mapSize); + return UNKNOWN_ERROR; + } const uint32_t* p = map + IDMAP_HEADER_SIZE + 1; + // find first defined type while (*p == 0) { ++p; + if (--typeCount == 0) { + ALOGW("corrupt idmap: types declared, none found\n"); + return UNKNOWN_ERROR; + } + } + + // determine package id from first entry of first type + const uint32_t offset = *p + IDMAP_HEADER_SIZE + 2; + if (offset > mapSize) { + ALOGW("corrupt idmap: entry offset %d points outside map size %d\n", offset, mapSize); + return UNKNOWN_ERROR; } - *outId = (map[*p + IDMAP_HEADER_SIZE + 2] >> 24) & 0x000000ff; + *outId = (map[offset] >> 24) & 0x000000ff; + return NO_ERROR; } @@ -2461,7 +2487,7 @@ struct ResTable::Header size_t size; const uint8_t* dataEnd; size_t index; - void* cookie; + int32_t cookie; ResStringPool values; uint32_t* resourceIDMap; @@ -2860,12 +2886,12 @@ ResTable::ResTable() //ALOGI("Creating ResTable %p\n", this); } -ResTable::ResTable(const void* data, size_t size, void* cookie, bool copyData) +ResTable::ResTable(const void* data, size_t size, const int32_t cookie, bool copyData) : mError(NO_INIT) { memset(&mParams, 0, sizeof(mParams)); memset(mPackageMap, 0, sizeof(mPackageMap)); - add(data, size, cookie, copyData); + addInternal(data, size, cookie, NULL /* asset */, copyData, NULL /* idMap */); LOG_FATAL_IF(mError != NO_ERROR, "Error parsing resource table"); //ALOGI("Creating ResTable %p\n", this); } @@ -2881,13 +2907,12 @@ inline ssize_t ResTable::getResourcePackageIndex(uint32_t resID) const return ((ssize_t)mPackageMap[Res_GETPACKAGE(resID)+1])-1; } -status_t ResTable::add(const void* data, size_t size, void* cookie, bool copyData, - const void* idmap) -{ - return add(data, size, cookie, NULL, copyData, reinterpret_cast<const Asset*>(idmap)); +status_t ResTable::add(const void* data, size_t size) { + return addInternal(data, size, 0 /* cookie */, NULL /* asset */, + false /* copyData */, NULL /* idMap */); } -status_t ResTable::add(Asset* asset, void* cookie, bool copyData, const void* idmap) +status_t ResTable::add(Asset* asset, const int32_t cookie, bool copyData, const void* idmap) { const void* data = asset->getBuffer(true); if (data == NULL) { @@ -2895,7 +2920,8 @@ status_t ResTable::add(Asset* asset, void* cookie, bool copyData, const void* id return UNKNOWN_ERROR; } size_t size = (size_t)asset->getLength(); - return add(data, size, cookie, asset, copyData, reinterpret_cast<const Asset*>(idmap)); + return addInternal(data, size, cookie, asset, copyData, + reinterpret_cast<const Asset*>(idmap)); } status_t ResTable::add(ResTable* src) @@ -2922,7 +2948,7 @@ status_t ResTable::add(ResTable* src) return mError; } -status_t ResTable::add(const void* data, size_t size, void* cookie, +status_t ResTable::addInternal(const void* data, size_t size, const int32_t cookie, Asset* asset, bool copyData, const Asset* idmap) { if (!data) return NO_ERROR; @@ -2945,7 +2971,7 @@ status_t ResTable::add(const void* data, size_t size, void* cookie, const bool notDeviceEndian = htods(0xf0) != 0xf0; LOAD_TABLE_NOISY( - ALOGV("Adding resources to ResTable: data=%p, size=0x%x, cookie=%p, asset=%p, copy=%d " + ALOGV("Adding resources to ResTable: data=%p, size=0x%x, cookie=%d, asset=%p, copy=%d " "idmap=%p\n", data, size, cookie, asset, copyData, idmap)); if (copyData || notDeviceEndian) { @@ -4930,7 +4956,7 @@ const ResStringPool* ResTable::getTableStringBlock(size_t index) const return &mHeaders[index]->values; } -void* ResTable::getTableCookie(size_t index) const +int32_t ResTable::getTableCookie(size_t index) const { return mHeaders[index]->cookie; } @@ -5334,23 +5360,30 @@ status_t ResTable::parsePackage(const ResTable_package* const pkg, return NO_ERROR; } -status_t ResTable::createIdmap(const ResTable& overlay, uint32_t originalCrc, uint32_t overlayCrc, - void** outData, size_t* outSize) const +status_t ResTable::createIdmap(const ResTable& overlay, + uint32_t targetCrc, uint32_t overlayCrc, + const char* targetPath, const char* overlayPath, + void** outData, size_t* outSize) const { // see README for details on the format of map if (mPackageGroups.size() == 0) { + ALOGW("idmap: target package has no package groups, cannot create idmap\n"); return UNKNOWN_ERROR; } if (mPackageGroups[0]->packages.size() == 0) { + ALOGW("idmap: target package has no packages in its first package group, " + "cannot create idmap\n"); return UNKNOWN_ERROR; } Vector<Vector<uint32_t> > map; + // overlaid packages are assumed to contain only one package group const PackageGroup* pg = mPackageGroups[0]; const Package* pkg = pg->packages[0]; size_t typeCount = pkg->types.size(); // starting size is header + first item (number of types in map) *outSize = (IDMAP_HEADER_SIZE + 1) * sizeof(uint32_t); + // overlay packages are assumed to contain only one package group const String16 overlayPackage(overlay.mPackageGroups[0]->packages[0]->package->name); const uint32_t pkg_id = pkg->package->id << 24; @@ -5368,7 +5401,7 @@ status_t ResTable::createIdmap(const ResTable& overlay, uint32_t originalCrc, ui | (0x00ff0000 & ((typeIndex+1)<<16)) | (0x0000ffff & (entryIndex)); resource_name resName; - if (!this->getResourceName(resID, true, &resName)) { + if (!this->getResourceName(resID, false, &resName)) { ALOGW("idmap: resource 0x%08x has spec but lacks values, skipping\n", resID); // add dummy value, or trimming leading/trailing zeroes later will fail vector.push(0); @@ -5426,8 +5459,22 @@ status_t ResTable::createIdmap(const ResTable& overlay, uint32_t originalCrc, ui } uint32_t* data = (uint32_t*)*outData; *data++ = htodl(IDMAP_MAGIC); - *data++ = htodl(originalCrc); + *data++ = htodl(targetCrc); *data++ = htodl(overlayCrc); + const char* paths[] = { targetPath, overlayPath }; + for (int j = 0; j < 2; ++j) { + char* p = (char*)data; + const char* path = paths[j]; + const size_t I = strlen(path); + if (I > 255) { + ALOGV("path exceeds expected 255 characters: %s\n", path); + return UNKNOWN_ERROR; + } + for (size_t i = 0; i < 256; ++i) { + *p++ = i < I ? path[i] : '\0'; + } + data += 256 / sizeof(uint32_t); + } const size_t mapSize = map.size(); *data++ = htodl(mapSize); size_t offset = mapSize; @@ -5442,6 +5489,10 @@ status_t ResTable::createIdmap(const ResTable& overlay, uint32_t originalCrc, ui offset += N; } } + if (offset == mapSize) { + ALOGW("idmap: no resources in overlay package present in base package\n"); + return UNKNOWN_ERROR; + } for (size_t i = 0; i < mapSize; ++i) { const Vector<uint32_t>& vector = map.itemAt(i); const size_t N = vector.size(); @@ -5463,14 +5514,25 @@ status_t ResTable::createIdmap(const ResTable& overlay, uint32_t originalCrc, ui } bool ResTable::getIdmapInfo(const void* idmap, size_t sizeBytes, - uint32_t* pOriginalCrc, uint32_t* pOverlayCrc) + uint32_t* pTargetCrc, uint32_t* pOverlayCrc, + String8* pTargetPath, String8* pOverlayPath) { const uint32_t* map = (const uint32_t*)idmap; if (!assertIdmapHeader(map, sizeBytes)) { return false; } - *pOriginalCrc = map[1]; - *pOverlayCrc = map[2]; + if (pTargetCrc) { + *pTargetCrc = map[1]; + } + if (pOverlayCrc) { + *pOverlayCrc = map[2]; + } + if (pTargetPath) { + pTargetPath->setTo(reinterpret_cast<const char*>(map + 3)); + } + if (pOverlayPath) { + pOverlayPath->setTo(reinterpret_cast<const char*>(map + 3 + 256 / sizeof(uint32_t))); + } return true; } diff --git a/libs/hwui/font/Font.cpp b/libs/hwui/font/Font.cpp index 18983d8..8f5beb8 100644 --- a/libs/hwui/font/Font.cpp +++ b/libs/hwui/font/Font.cpp @@ -404,10 +404,10 @@ void Font::render(SkPaint* paint, const char* text, uint32_t start, uint32_t len // If it's still not valid, we couldn't cache it, so we shouldn't // draw garbage; also skip empty glyphs (spaces) if (cachedGlyph->mIsValid && cachedGlyph->mCacheTexture) { - float penX = x + positions[(glyphsCount << 1)]; - float penY = y + positions[(glyphsCount << 1) + 1]; + int penX = x + (int) roundf(positions[(glyphsCount << 1)]); + int penY = y + (int) roundf(positions[(glyphsCount << 1) + 1]); - (*this.*render)(cachedGlyph, roundf(penX), roundf(penY), + (*this.*render)(cachedGlyph, penX, penY, bitmap, bitmapW, bitmapH, bounds, positions); } diff --git a/libs/hwui/utils/TinyHashMap.h b/libs/hwui/utils/TinyHashMap.h index 8855140..4ff9a42 100644 --- a/libs/hwui/utils/TinyHashMap.h +++ b/libs/hwui/utils/TinyHashMap.h @@ -24,8 +24,6 @@ namespace uirenderer { /** * A very simple hash map that doesn't allow duplicate keys, overwriting the older entry. - * - * Currently, expects simple keys that are handled by hash_t() */ template <typename TKey, typename TValue> class TinyHashMap { @@ -36,7 +34,7 @@ public: * Puts an entry in the hash, removing any existing entry with the same key */ void put(TKey key, TValue value) { - hash_t hash = hash_t(key); + hash_t hash = android::hash_type(key); ssize_t index = mTable.find(-1, hash, key); if (index != -1) { @@ -51,7 +49,7 @@ public: * Return true if key is in the map, in which case stores the value in the output ref */ bool get(TKey key, TValue& outValue) { - hash_t hash = hash_t(key); + hash_t hash = android::hash_type(key); ssize_t index = mTable.find(-1, hash, key); if (index == -1) { return false; diff --git a/media/jni/android_media_ImageReader.cpp b/media/jni/android_media_ImageReader.cpp index 0030dbd..d475eee 100644 --- a/media/jni/android_media_ImageReader.cpp +++ b/media/jni/android_media_ImageReader.cpp @@ -707,6 +707,7 @@ static jint ImageReader_imageSetup(JNIEnv* env, jobject thiz, } status_t res = consumer->lockNextBuffer(buffer); if (res != NO_ERROR) { + ctx->returnLockedBuffer(buffer); if (res != BAD_VALUE /*no buffers*/) { if (res == NOT_ENOUGH_DATA) { return ACQUIRE_MAX_IMAGES; diff --git a/media/jni/android_media_MediaMuxer.cpp b/media/jni/android_media_MediaMuxer.cpp index 2c16a05..3561b06 100644 --- a/media/jni/android_media_MediaMuxer.cpp +++ b/media/jni/android_media_MediaMuxer.cpp @@ -132,7 +132,7 @@ static void android_media_MediaMuxer_writeSampleData( } // Constructor counterpart. -static jint android_media_MediaMuxer_native_setup( +static jlong android_media_MediaMuxer_native_setup( JNIEnv *env, jclass clazz, jobject fileDescriptor, jint format) { int fd = jniGetFDFromFileDescriptor(env, fileDescriptor); @@ -142,7 +142,7 @@ static jint android_media_MediaMuxer_native_setup( static_cast<MediaMuxer::OutputFormat>(format); sp<MediaMuxer> muxer = new MediaMuxer(fd, fileFormat); muxer->incStrong(clazz); - return int(muxer.get()); + return reinterpret_cast<jlong>(muxer.get()); } static void android_media_MediaMuxer_setOrientationHint( diff --git a/native/android/asset_manager.cpp b/native/android/asset_manager.cpp index 01db1d3..dee3f8c 100644 --- a/native/android/asset_manager.cpp +++ b/native/android/asset_manager.cpp @@ -76,12 +76,12 @@ AAssetManager* AAssetManager_fromJava(JNIEnv* env, jobject assetManager) if (gJNIConfigured == false) { jclass amClass = env->FindClass("android/content/res/AssetManager"); - gAssetManagerOffsets.mObject = env->GetFieldID(amClass, "mObject", "I"); + gAssetManagerOffsets.mObject = env->GetFieldID(amClass, "mObject", "J"); gJNIConfigured = true; } } - return (AAssetManager*) env->GetIntField(assetManager, gAssetManagerOffsets.mObject); + return (AAssetManager*) env->GetLongField(assetManager, gAssetManagerOffsets.mObject); } AAsset* AAssetManager_open(AAssetManager* amgr, const char* filename, int mode) diff --git a/opengl/java/com/google/android/gles_jni/EGLConfigImpl.java b/opengl/java/com/google/android/gles_jni/EGLConfigImpl.java index c2f4400..1902a40 100644 --- a/opengl/java/com/google/android/gles_jni/EGLConfigImpl.java +++ b/opengl/java/com/google/android/gles_jni/EGLConfigImpl.java @@ -19,13 +19,13 @@ package com.google.android.gles_jni; import javax.microedition.khronos.egl.*; public class EGLConfigImpl extends EGLConfig { - private int mEGLConfig; + private long mEGLConfig; - EGLConfigImpl(int config) { + EGLConfigImpl(long config) { mEGLConfig = config; } - int get() { + long get() { return mEGLConfig; } } diff --git a/opengl/java/com/google/android/gles_jni/EGLContextImpl.java b/opengl/java/com/google/android/gles_jni/EGLContextImpl.java index cd36099..47369ac 100644 --- a/opengl/java/com/google/android/gles_jni/EGLContextImpl.java +++ b/opengl/java/com/google/android/gles_jni/EGLContextImpl.java @@ -21,13 +21,13 @@ import javax.microedition.khronos.opengles.GL; public class EGLContextImpl extends EGLContext { private GLImpl mGLContext; - int mEGLContext; - - public EGLContextImpl(int ctx) { + long mEGLContext; + + public EGLContextImpl(long ctx) { mEGLContext = ctx; mGLContext = new GLImpl(); } - + @Override public GL getGL() { return mGLContext; @@ -45,6 +45,12 @@ public class EGLContextImpl extends EGLContext { @Override public int hashCode() { - return mEGLContext; + /* + * Based on the algorithm suggested in + * http://developer.android.com/reference/java/lang/Object.html + */ + int result = 17; + result = 31 * result + (int) (mEGLContext ^ (mEGLContext >>> 32)); + return result; } } diff --git a/opengl/java/com/google/android/gles_jni/EGLDisplayImpl.java b/opengl/java/com/google/android/gles_jni/EGLDisplayImpl.java index e6c9817..9b932fc 100644 --- a/opengl/java/com/google/android/gles_jni/EGLDisplayImpl.java +++ b/opengl/java/com/google/android/gles_jni/EGLDisplayImpl.java @@ -19,9 +19,9 @@ package com.google.android.gles_jni; import javax.microedition.khronos.egl.*; public class EGLDisplayImpl extends EGLDisplay { - int mEGLDisplay; + long mEGLDisplay; - public EGLDisplayImpl(int dpy) { + public EGLDisplayImpl(long dpy) { mEGLDisplay = dpy; } @@ -38,6 +38,12 @@ public class EGLDisplayImpl extends EGLDisplay { @Override public int hashCode() { - return mEGLDisplay; + /* + * Based on the algorithm suggested in + * http://developer.android.com/reference/java/lang/Object.html + */ + int result = 17; + result = 31 * result + (int) (mEGLDisplay ^ (mEGLDisplay >>> 32)); + return result; } } diff --git a/opengl/java/com/google/android/gles_jni/EGLImpl.java b/opengl/java/com/google/android/gles_jni/EGLImpl.java index 64a54c2..41fb072 100644 --- a/opengl/java/com/google/android/gles_jni/EGLImpl.java +++ b/opengl/java/com/google/android/gles_jni/EGLImpl.java @@ -51,7 +51,7 @@ public class EGLImpl implements EGL10 { public static native int getInitCount(EGLDisplay display); public EGLContext eglCreateContext(EGLDisplay display, EGLConfig config, EGLContext share_context, int[] attrib_list) { - int eglContextId = _eglCreateContext(display, config, share_context, attrib_list); + long eglContextId = _eglCreateContext(display, config, share_context, attrib_list); if (eglContextId == 0) { return EGL10.EGL_NO_CONTEXT; } @@ -59,7 +59,7 @@ public class EGLImpl implements EGL10 { } public EGLSurface eglCreatePbufferSurface(EGLDisplay display, EGLConfig config, int[] attrib_list) { - int eglSurfaceId = _eglCreatePbufferSurface(display, config, attrib_list); + long eglSurfaceId = _eglCreatePbufferSurface(display, config, attrib_list); if (eglSurfaceId == 0) { return EGL10.EGL_NO_SURFACE; } @@ -87,7 +87,7 @@ public class EGLImpl implements EGL10 { sur = (Surface) native_window; } - int eglSurfaceId; + long eglSurfaceId; if (sur != null) { eglSurfaceId = _eglCreateWindowSurface(display, config, sur, attrib_list); } else if (native_window instanceof SurfaceTexture) { @@ -106,7 +106,7 @@ public class EGLImpl implements EGL10 { } public synchronized EGLDisplay eglGetDisplay(Object native_display) { - int value = _eglGetDisplay(native_display); + long value = _eglGetDisplay(native_display); if (value == 0) { return EGL10.EGL_NO_DISPLAY; } @@ -116,7 +116,7 @@ public class EGLImpl implements EGL10 { } public synchronized EGLContext eglGetCurrentContext() { - int value = _eglGetCurrentContext(); + long value = _eglGetCurrentContext(); if (value == 0) { return EGL10.EGL_NO_CONTEXT; } @@ -126,7 +126,7 @@ public class EGLImpl implements EGL10 { } public synchronized EGLDisplay eglGetCurrentDisplay() { - int value = _eglGetCurrentDisplay(); + long value = _eglGetCurrentDisplay(); if (value == 0) { return EGL10.EGL_NO_DISPLAY; } @@ -136,7 +136,7 @@ public class EGLImpl implements EGL10 { } public synchronized EGLSurface eglGetCurrentSurface(int readdraw) { - int value = _eglGetCurrentSurface(readdraw); + long value = _eglGetCurrentSurface(readdraw); if (value == 0) { return EGL10.EGL_NO_SURFACE; } @@ -145,15 +145,15 @@ public class EGLImpl implements EGL10 { return mSurface; } - private native int _eglCreateContext(EGLDisplay display, EGLConfig config, EGLContext share_context, int[] attrib_list); - private native int _eglCreatePbufferSurface(EGLDisplay display, EGLConfig config, int[] attrib_list); + private native long _eglCreateContext(EGLDisplay display, EGLConfig config, EGLContext share_context, int[] attrib_list); + private native long _eglCreatePbufferSurface(EGLDisplay display, EGLConfig config, int[] attrib_list); private native void _eglCreatePixmapSurface(EGLSurface sur, EGLDisplay display, EGLConfig config, Object native_pixmap, int[] attrib_list); - private native int _eglCreateWindowSurface(EGLDisplay display, EGLConfig config, Object native_window, int[] attrib_list); - private native int _eglCreateWindowSurfaceTexture(EGLDisplay display, EGLConfig config, Object native_window, int[] attrib_list); - private native int _eglGetDisplay(Object native_display); - private native int _eglGetCurrentContext(); - private native int _eglGetCurrentDisplay(); - private native int _eglGetCurrentSurface(int readdraw); + private native long _eglCreateWindowSurface(EGLDisplay display, EGLConfig config, Object native_window, int[] attrib_list); + private native long _eglCreateWindowSurfaceTexture(EGLDisplay display, EGLConfig config, Object native_window, int[] attrib_list); + private native long _eglGetDisplay(Object native_display); + private native long _eglGetCurrentContext(); + private native long _eglGetCurrentDisplay(); + private native long _eglGetCurrentSurface(int readdraw); native private static void _nativeClassInit(); static { _nativeClassInit(); } diff --git a/opengl/java/com/google/android/gles_jni/EGLSurfaceImpl.java b/opengl/java/com/google/android/gles_jni/EGLSurfaceImpl.java index e7f15dc..7a3ed24 100644 --- a/opengl/java/com/google/android/gles_jni/EGLSurfaceImpl.java +++ b/opengl/java/com/google/android/gles_jni/EGLSurfaceImpl.java @@ -19,13 +19,13 @@ package com.google.android.gles_jni; import javax.microedition.khronos.egl.*; public class EGLSurfaceImpl extends EGLSurface { - int mEGLSurface; - private int mNativePixelRef; + long mEGLSurface; + private long mNativePixelRef; public EGLSurfaceImpl() { mEGLSurface = 0; mNativePixelRef = 0; } - public EGLSurfaceImpl(int surface) { + public EGLSurfaceImpl(long surface) { mEGLSurface = surface; mNativePixelRef = 0; } @@ -43,6 +43,12 @@ public class EGLSurfaceImpl extends EGLSurface { @Override public int hashCode() { - return mEGLSurface; + /* + * Based on the algorithm suggested in + * http://developer.android.com/reference/java/lang/Object.html + */ + int result = 17; + result = 31 * result + (int) (mEGLSurface ^ (mEGLSurface >>> 32)); + return result; } } diff --git a/preloaded-classes b/preloaded-classes index 342126d..02bd0bc 100644 --- a/preloaded-classes +++ b/preloaded-classes @@ -2456,8 +2456,6 @@ org.apache.harmony.security.fortress.Engine$ServiceCacheEntry org.apache.harmony.security.fortress.Engine$SpiAndProvider org.apache.harmony.security.fortress.SecurityAccess org.apache.harmony.security.fortress.Services -org.apache.harmony.security.provider.cert.DRLCertFactory -org.apache.harmony.security.provider.cert.X509CertImpl org.apache.harmony.security.provider.crypto.CryptoProvider org.apache.harmony.security.utils.AlgNameMapper org.apache.harmony.security.utils.ObjectIdentifier diff --git a/graphics/java/android/renderscript/Allocation.java b/rs/java/android/renderscript/Allocation.java index dca934f..c2bab91 100644 --- a/graphics/java/android/renderscript/Allocation.java +++ b/rs/java/android/renderscript/Allocation.java @@ -24,7 +24,6 @@ import android.content.res.AssetManager; import android.graphics.Bitmap; import android.graphics.BitmapFactory; import android.view.Surface; -import android.graphics.SurfaceTexture; import android.util.Log; import android.util.TypedValue; import android.graphics.Canvas; @@ -78,10 +77,69 @@ public class Allocation extends BaseObj { int mCurrentDimY; int mCurrentDimZ; int mCurrentCount; - static HashMap<Integer, Allocation> mAllocationMap = - new HashMap<Integer, Allocation>(); + static HashMap<Long, Allocation> mAllocationMap = + new HashMap<Long, Allocation>(); OnBufferAvailableListener mBufferNotifier; + private Element.DataType validateObjectIsPrimitiveArray(Object d, boolean checkType) { + final Class c = d.getClass(); + if (!c.isArray()) { + throw new RSIllegalArgumentException("Object passed is not an array of primitives."); + } + final Class cmp = c.getComponentType(); + if (!cmp.isPrimitive()) { + throw new RSIllegalArgumentException("Object passed is not an Array of primitives."); + } + + if (cmp == Long.TYPE) { + if (checkType) { + validateIsInt64(); + return mType.mElement.mType; + } + return Element.DataType.SIGNED_64; + } + + if (cmp == Integer.TYPE) { + if (checkType) { + validateIsInt32(); + return mType.mElement.mType; + } + return Element.DataType.SIGNED_32; + } + + if (cmp == Short.TYPE) { + if (checkType) { + validateIsInt16(); + return mType.mElement.mType; + } + return Element.DataType.SIGNED_16; + } + + if (cmp == Byte.TYPE) { + if (checkType) { + validateIsInt8(); + return mType.mElement.mType; + } + return Element.DataType.SIGNED_8; + } + + if (cmp == Float.TYPE) { + if (checkType) { + validateIsFloat32(); + } + return Element.DataType.FLOAT_32; + } + + if (cmp == Double.TYPE) { + if (checkType) { + validateIsFloat64(); + } + return Element.DataType.FLOAT_64; + } + return null; + } + + /** * The usage of the Allocation. These signal to RenderScript where to place * the Allocation in memory. @@ -127,17 +185,17 @@ public class Allocation extends BaseObj { public static final int USAGE_GRAPHICS_RENDER_TARGET = 0x0010; /** - * The Allocation will be used as a {@link android.graphics.SurfaceTexture} - * consumer. This usage will cause the Allocation to be created as - * read-only. + * The Allocation will be used as a {@link android.view.Surface} + * consumer. This usage will cause the Allocation to be created + * as read-only. * */ 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 - * android.graphics.SurfaceTexture} will be forced to those of the + * android.view.Surface} will be forced to those of the * Allocation. * */ @@ -188,7 +246,7 @@ public class Allocation extends BaseObj { } - private int getIDSafe() { + private long getIDSafe() { if (mAdaptedAllocation != null) { return mAdaptedAllocation.getID(mRS); } @@ -224,6 +282,9 @@ public class Allocation extends BaseObj { * */ public int getBytesSize() { + if (mType.mDimYuv != 0) { + return (int)Math.ceil(mType.getCount() * mType.getElement().getBytesSize() * 1.5); + } return mType.getCount() * mType.getElement().getBytesSize(); } @@ -244,7 +305,7 @@ public class Allocation extends BaseObj { mBitmap = b; } - Allocation(int id, RenderScript rs, Type t, int usage) { + Allocation(long id, RenderScript rs, Type t, int usage) { super(id, rs); if ((usage & ~(USAGE_SCRIPT | USAGE_GRAPHICS_TEXTURE | @@ -290,6 +351,15 @@ public class Allocation extends BaseObj { super.finalize(); } + private void validateIsInt64() { + if ((mType.mElement.mType == Element.DataType.SIGNED_64) || + (mType.mElement.mType == Element.DataType.UNSIGNED_64)) { + return; + } + throw new RSIllegalArgumentException( + "64 bit integer source does not match allocation type " + mType.mElement.mType); + } + private void validateIsInt32() { if ((mType.mElement.mType == Element.DataType.SIGNED_32) || (mType.mElement.mType == Element.DataType.UNSIGNED_32)) { @@ -325,6 +395,14 @@ public class Allocation extends BaseObj { "32 bit float source does not match allocation type " + mType.mElement.mType); } + private void validateIsFloat64() { + if (mType.mElement.mType == Element.DataType.FLOAT_64) { + return; + } + throw new RSIllegalArgumentException( + "64 bit float source does not match allocation type " + mType.mElement.mType); + } + private void validateIsObject() { if ((mType.mElement.mType == Element.DataType.RS_ELEMENT) || (mType.mElement.mType == Element.DataType.RS_TYPE) || @@ -345,7 +423,7 @@ public class Allocation extends BaseObj { @Override void updateFromNative() { super.updateFromNative(); - int typeID = mRS.nAllocationGetType(getID(mRS)); + long typeID = mRS.nAllocationGetType(getID(mRS)); if(typeID != 0) { mType = new Type(typeID, mRS); mType.updateFromNative(); @@ -412,14 +490,6 @@ public class Allocation extends BaseObj { } /** - * Delete once code is updated. - * @hide - */ - public void ioSendOutput() { - ioSend(); - } - - /** * Receive the latest input into the Allocation. This operation * is only valid if {@link #USAGE_IO_INPUT} is set on the Allocation. * @@ -448,9 +518,11 @@ public class Allocation extends BaseObj { throw new RSIllegalArgumentException("Array size mismatch, allocation sizeX = " + mCurrentCount + ", array length = " + d.length); } + // FIXME: requires 64-bit path + int i[] = new int[d.length]; for (int ct=0; ct < d.length; ct++) { - i[ct] = d[ct].getID(mRS); + i[ct] = (int)d[ct].getID(mRS); } copy1DRangeFromUnchecked(0, mCurrentCount, i); Trace.traceEnd(RenderScript.TRACE_TAG); @@ -511,23 +583,31 @@ public class Allocation extends BaseObj { } } + private void copyFromUnchecked(Object array, Element.DataType dt, int arrayLen) { + Trace.traceBegin(RenderScript.TRACE_TAG, "copyFromUnchecked"); + mRS.validate(); + if (mCurrentDimZ > 0) { + copy3DRangeFromUnchecked(0, 0, 0, mCurrentDimX, mCurrentDimY, mCurrentDimZ, array, dt, arrayLen); + } else if (mCurrentDimY > 0) { + copy2DRangeFromUnchecked(0, 0, mCurrentDimX, mCurrentDimY, array, dt, arrayLen); + } else { + copy1DRangeFromUnchecked(0, mCurrentCount, array, dt, arrayLen); + } + Trace.traceEnd(RenderScript.TRACE_TAG); + } + /** * Copy into this Allocation from an array. This method does not guarantee * that the Allocation is compatible with the input buffer; it copies memory * without reinterpretation. * - * @param d the source data array + * @param array The source data array + * @hide */ - public void copyFromUnchecked(int[] d) { + public void copyFromUnchecked(Object array) { Trace.traceBegin(RenderScript.TRACE_TAG, "copyFromUnchecked"); - mRS.validate(); - if (mCurrentDimZ > 0) { - copy3DRangeFromUnchecked(0, 0, 0, mCurrentDimX, mCurrentDimY, mCurrentDimZ, d); - } else if (mCurrentDimY > 0) { - copy2DRangeFromUnchecked(0, 0, mCurrentDimX, mCurrentDimY, d); - } else { - copy1DRangeFromUnchecked(0, mCurrentCount, d); - } + copyFromUnchecked(array, validateObjectIsPrimitiveArray(array, false), + java.lang.reflect.Array.getLength(array)); Trace.traceEnd(RenderScript.TRACE_TAG); } @@ -538,17 +618,19 @@ public class Allocation extends BaseObj { * * @param d the source data array */ + public void copyFromUnchecked(int[] d) { + copyFromUnchecked(d, Element.DataType.SIGNED_32, d.length); + } + + /** + * Copy into this Allocation from an array. This method does not guarantee + * that the Allocation is compatible with the input buffer; it copies memory + * without reinterpretation. + * + * @param d the source data array + */ public void copyFromUnchecked(short[] d) { - Trace.traceBegin(RenderScript.TRACE_TAG, "copyFromUnchecked"); - mRS.validate(); - if (mCurrentDimZ > 0) { - copy3DRangeFromUnchecked(0, 0, 0, mCurrentDimX, mCurrentDimY, mCurrentDimZ, d); - } else if (mCurrentDimY > 0) { - copy2DRangeFromUnchecked(0, 0, mCurrentDimX, mCurrentDimY, d); - } else { - copy1DRangeFromUnchecked(0, mCurrentCount, d); - } - Trace.traceEnd(RenderScript.TRACE_TAG); + copyFromUnchecked(d, Element.DataType.SIGNED_16, d.length); } /** @@ -559,16 +641,7 @@ public class Allocation extends BaseObj { * @param d the source data array */ public void copyFromUnchecked(byte[] d) { - Trace.traceBegin(RenderScript.TRACE_TAG, "copyFromUnchecked"); - mRS.validate(); - if (mCurrentDimZ > 0) { - copy3DRangeFromUnchecked(0, 0, 0, mCurrentDimX, mCurrentDimY, mCurrentDimZ, d); - } else if (mCurrentDimY > 0) { - copy2DRangeFromUnchecked(0, 0, mCurrentDimX, mCurrentDimY, d); - } else { - copy1DRangeFromUnchecked(0, mCurrentCount, d); - } - Trace.traceEnd(RenderScript.TRACE_TAG); + copyFromUnchecked(d, Element.DataType.SIGNED_8, d.length); } /** @@ -579,57 +652,48 @@ public class Allocation extends BaseObj { * @param d the source data array */ public void copyFromUnchecked(float[] d) { - Trace.traceBegin(RenderScript.TRACE_TAG, "copyFromUnchecked"); - mRS.validate(); - if (mCurrentDimZ > 0) { - copy3DRangeFromUnchecked(0, 0, 0, mCurrentDimX, mCurrentDimY, mCurrentDimZ, d); - } else if (mCurrentDimY > 0) { - copy2DRangeFromUnchecked(0, 0, mCurrentDimX, mCurrentDimY, d); - } else { - copy1DRangeFromUnchecked(0, mCurrentCount, d); - } - Trace.traceEnd(RenderScript.TRACE_TAG); + copyFromUnchecked(d, Element.DataType.FLOAT_32, d.length); } /** * Copy into this Allocation from an array. This variant is type checked * and will generate exceptions if the Allocation's {@link - * android.renderscript.Element} is not a 32 bit integer type. + * android.renderscript.Element} does not match the array's + * primitive type. * * @param d the source data array + * @hide */ - public void copyFrom(int[] d) { + public void copyFrom(Object array) { Trace.traceBegin(RenderScript.TRACE_TAG, "copyFrom"); - mRS.validate(); - if (mCurrentDimZ > 0) { - copy3DRangeFrom(0, 0, 0, mCurrentDimX, mCurrentDimY, mCurrentDimZ, d); - } else if (mCurrentDimY > 0) { - copy2DRangeFrom(0, 0, mCurrentDimX, mCurrentDimY, d); - } else { - copy1DRangeFrom(0, mCurrentCount, d); - } + copyFromUnchecked(array, validateObjectIsPrimitiveArray(array, true), + java.lang.reflect.Array.getLength(array)); Trace.traceEnd(RenderScript.TRACE_TAG); } /** * Copy into this Allocation from an array. This variant is type checked * and will generate exceptions if the Allocation's {@link + * android.renderscript.Element} is not a 32 bit integer type. + * + * @param d the source data array + */ + public void copyFrom(int[] d) { + validateIsInt32(); + copyFromUnchecked(d, Element.DataType.SIGNED_32, d.length); + } + + /** + * Copy into this Allocation from an array. This variant is type checked + * and will generate exceptions if the Allocation's {@link * android.renderscript.Element} is not a 16 bit integer type. * * @param d the source data array */ public void copyFrom(short[] d) { - Trace.traceBegin(RenderScript.TRACE_TAG, "copyFrom"); - mRS.validate(); - if (mCurrentDimZ > 0) { - copy3DRangeFrom(0, 0, 0, mCurrentDimX, mCurrentDimY, mCurrentDimZ, d); - } else if (mCurrentDimY > 0) { - copy2DRangeFrom(0, 0, mCurrentDimX, mCurrentDimY, d); - } else { - copy1DRangeFrom(0, mCurrentCount, d); - } - Trace.traceEnd(RenderScript.TRACE_TAG); + validateIsInt16(); + copyFromUnchecked(d, Element.DataType.SIGNED_16, d.length); } /** @@ -640,16 +704,8 @@ public class Allocation extends BaseObj { * @param d the source data array */ public void copyFrom(byte[] d) { - Trace.traceBegin(RenderScript.TRACE_TAG, "copyFrom"); - mRS.validate(); - if (mCurrentDimZ > 0) { - copy3DRangeFrom(0, 0, 0, mCurrentDimX, mCurrentDimY, mCurrentDimZ, d); - } else if (mCurrentDimY > 0) { - copy2DRangeFrom(0, 0, mCurrentDimX, mCurrentDimY, d); - } else { - copy1DRangeFrom(0, mCurrentCount, d); - } - Trace.traceEnd(RenderScript.TRACE_TAG); + validateIsInt8(); + copyFromUnchecked(d, Element.DataType.SIGNED_8, d.length); } /** @@ -660,16 +716,8 @@ public class Allocation extends BaseObj { * @param d the source data array */ public void copyFrom(float[] d) { - Trace.traceBegin(RenderScript.TRACE_TAG, "copyFrom"); - mRS.validate(); - if (mCurrentDimZ > 0) { - copy3DRangeFrom(0, 0, 0, mCurrentDimX, mCurrentDimY, mCurrentDimZ, d); - } else if (mCurrentDimY > 0) { - copy2DRangeFrom(0, 0, mCurrentDimX, mCurrentDimY, d); - } else { - copy1DRangeFrom(0, mCurrentCount, d); - } - Trace.traceEnd(RenderScript.TRACE_TAG); + validateIsFloat32(); + copyFromUnchecked(d, Element.DataType.FLOAT_32, d.length); } /** @@ -798,6 +846,30 @@ public class Allocation extends BaseObj { mRS.nAllocationGenerateMipmaps(getID(mRS)); } + private void copy1DRangeFromUnchecked(int off, int count, Object array, + Element.DataType dt, int arrayLen) { + Trace.traceBegin(RenderScript.TRACE_TAG, "copy1DRangeFromUnchecked"); + final int dataSize = mType.mElement.getBytesSize() * count; + data1DChecks(off, count, arrayLen * dt.mSize, dataSize); + mRS.nAllocationData1D(getIDSafe(), off, mSelectedLOD, count, array, dataSize, dt); + Trace.traceEnd(RenderScript.TRACE_TAG); + } + + /** + * Copy an array into part of this Allocation. This method does not + * guarantee that the Allocation is compatible with the input buffer. + * + * @param off The offset of the first element to be copied. + * @param count The number of elements to be copied. + * @param array The source data array + * @hide + */ + public void copy1DRangeFromUnchecked(int off, int count, Object array) { + copy1DRangeFromUnchecked(off, count, array, + validateObjectIsPrimitiveArray(array, false), + java.lang.reflect.Array.getLength(array)); + } + /** * Copy an array into part of this Allocation. This method does not * guarantee that the Allocation is compatible with the input buffer. @@ -807,11 +879,7 @@ public class Allocation extends BaseObj { * @param d the source data array */ public void copy1DRangeFromUnchecked(int off, int count, int[] d) { - Trace.traceBegin(RenderScript.TRACE_TAG, "copy1DRangeFromUnchecked"); - int dataSize = mType.mElement.getBytesSize() * count; - data1DChecks(off, count, d.length * 4, dataSize); - mRS.nAllocationData1D(getIDSafe(), off, mSelectedLOD, count, d, dataSize); - Trace.traceEnd(RenderScript.TRACE_TAG); + copy1DRangeFromUnchecked(off, count, (Object)d, Element.DataType.SIGNED_32, d.length); } /** @@ -823,11 +891,7 @@ public class Allocation extends BaseObj { * @param d the source data array */ public void copy1DRangeFromUnchecked(int off, int count, short[] d) { - Trace.traceBegin(RenderScript.TRACE_TAG, "copy1DRangeFromUnchecked"); - int dataSize = mType.mElement.getBytesSize() * count; - data1DChecks(off, count, d.length * 2, dataSize); - mRS.nAllocationData1D(getIDSafe(), off, mSelectedLOD, count, d, dataSize); - Trace.traceEnd(RenderScript.TRACE_TAG); + copy1DRangeFromUnchecked(off, count, (Object)d, Element.DataType.SIGNED_16, d.length); } /** @@ -839,11 +903,7 @@ public class Allocation extends BaseObj { * @param d the source data array */ public void copy1DRangeFromUnchecked(int off, int count, byte[] d) { - Trace.traceBegin(RenderScript.TRACE_TAG, "copy1DRangeFromUnchecked"); - int dataSize = mType.mElement.getBytesSize() * count; - data1DChecks(off, count, d.length, dataSize); - mRS.nAllocationData1D(getIDSafe(), off, mSelectedLOD, count, d, dataSize); - Trace.traceEnd(RenderScript.TRACE_TAG); + copy1DRangeFromUnchecked(off, count, (Object)d, Element.DataType.SIGNED_8, d.length); } /** @@ -855,11 +915,24 @@ public class Allocation extends BaseObj { * @param d the source data array */ public void copy1DRangeFromUnchecked(int off, int count, float[] d) { - Trace.traceBegin(RenderScript.TRACE_TAG, "copy1DRangeFromUnchecked"); - int dataSize = mType.mElement.getBytesSize() * count; - data1DChecks(off, count, d.length * 4, dataSize); - mRS.nAllocationData1D(getIDSafe(), off, mSelectedLOD, count, d, dataSize); - Trace.traceEnd(RenderScript.TRACE_TAG); + copy1DRangeFromUnchecked(off, count, (Object)d, Element.DataType.FLOAT_32, d.length); + } + + + /** + * Copy an array into part of this Allocation. This variant is type checked + * and will generate exceptions if the Allocation type does not + * match the component type of the array passed in. + * + * @param off The offset of the first element to be copied. + * @param count The number of elements to be copied. + * @param array The source data array. + * @hide + */ + public void copy1DRangeFrom(int off, int count, Object array) { + copy1DRangeFromUnchecked(off, count, array, + validateObjectIsPrimitiveArray(array, true), + java.lang.reflect.Array.getLength(array)); } /** @@ -872,10 +945,8 @@ public class Allocation extends BaseObj { * @param d the source data array */ public void copy1DRangeFrom(int off, int count, int[] d) { - Trace.traceBegin(RenderScript.TRACE_TAG, "copy1DRangeFrom"); validateIsInt32(); - copy1DRangeFromUnchecked(off, count, d); - Trace.traceEnd(RenderScript.TRACE_TAG); + copy1DRangeFromUnchecked(off, count, d, Element.DataType.SIGNED_32, d.length); } /** @@ -888,10 +959,8 @@ public class Allocation extends BaseObj { * @param d the source data array */ public void copy1DRangeFrom(int off, int count, short[] d) { - Trace.traceBegin(RenderScript.TRACE_TAG, "copy1DRangeFrom"); validateIsInt16(); - copy1DRangeFromUnchecked(off, count, d); - Trace.traceEnd(RenderScript.TRACE_TAG); + copy1DRangeFromUnchecked(off, count, d, Element.DataType.SIGNED_16, d.length); } /** @@ -904,10 +973,8 @@ public class Allocation extends BaseObj { * @param d the source data array */ public void copy1DRangeFrom(int off, int count, byte[] d) { - Trace.traceBegin(RenderScript.TRACE_TAG, "copy1DRangeFrom"); validateIsInt8(); - copy1DRangeFromUnchecked(off, count, d); - Trace.traceEnd(RenderScript.TRACE_TAG); + copy1DRangeFromUnchecked(off, count, d, Element.DataType.SIGNED_8, d.length); } /** @@ -920,11 +987,10 @@ public class Allocation extends BaseObj { * @param d the source data array. */ public void copy1DRangeFrom(int off, int count, float[] d) { - Trace.traceBegin(RenderScript.TRACE_TAG, "copy1DRangeFrom"); validateIsFloat32(); - copy1DRangeFromUnchecked(off, count, d); - Trace.traceEnd(RenderScript.TRACE_TAG); + copy1DRangeFromUnchecked(off, count, d, Element.DataType.FLOAT_32, d.length); } + /** * Copy part of an Allocation into this Allocation. * @@ -959,39 +1025,32 @@ public class Allocation extends BaseObj { } } - void copy2DRangeFromUnchecked(int xoff, int yoff, int w, int h, byte[] data) { - Trace.traceBegin(RenderScript.TRACE_TAG, "copy2DRangeFromUnchecked"); - mRS.validate(); - validate2DRange(xoff, yoff, w, h); - mRS.nAllocationData2D(getIDSafe(), xoff, yoff, mSelectedLOD, mSelectedFace.mID, - w, h, data, data.length); - Trace.traceEnd(RenderScript.TRACE_TAG); - } - - void copy2DRangeFromUnchecked(int xoff, int yoff, int w, int h, short[] data) { - Trace.traceBegin(RenderScript.TRACE_TAG, "copy2DRangeFromUnchecked"); - mRS.validate(); - validate2DRange(xoff, yoff, w, h); - mRS.nAllocationData2D(getIDSafe(), xoff, yoff, mSelectedLOD, mSelectedFace.mID, - w, h, data, data.length * 2); - Trace.traceEnd(RenderScript.TRACE_TAG); - } - - void copy2DRangeFromUnchecked(int xoff, int yoff, int w, int h, int[] data) { + void copy2DRangeFromUnchecked(int xoff, int yoff, int w, int h, Object array, + Element.DataType dt, int arrayLen) { Trace.traceBegin(RenderScript.TRACE_TAG, "copy2DRangeFromUnchecked"); mRS.validate(); validate2DRange(xoff, yoff, w, h); - mRS.nAllocationData2D(getIDSafe(), xoff, yoff, mSelectedLOD, mSelectedFace.mID, - w, h, data, data.length * 4); + mRS.nAllocationData2D(getIDSafe(), xoff, yoff, mSelectedLOD, mSelectedFace.mID, w, h, + array, arrayLen * dt.mSize, dt); Trace.traceEnd(RenderScript.TRACE_TAG); } - void copy2DRangeFromUnchecked(int xoff, int yoff, int w, int h, float[] data) { - Trace.traceBegin(RenderScript.TRACE_TAG, "copy2DRangeFromUnchecked"); - mRS.validate(); - validate2DRange(xoff, yoff, w, h); - mRS.nAllocationData2D(getIDSafe(), xoff, yoff, mSelectedLOD, mSelectedFace.mID, - w, h, data, data.length * 4); + /** + * Copy from an array into a rectangular region in this Allocation. The + * array is assumed to be tightly packed. + * + * @param xoff X offset of the region to update in this Allocation + * @param yoff Y offset of the region to update in this Allocation + * @param w Width of the region to update + * @param h Height of the region to update + * @param data to be placed into the Allocation + * @hide + */ + public void copy2DRangeFrom(int xoff, int yoff, int w, int h, Object array) { + Trace.traceBegin(RenderScript.TRACE_TAG, "copy2DRangeFrom"); + copy2DRangeFromUnchecked(xoff, yoff, w, h, array, + validateObjectIsPrimitiveArray(array, true), + java.lang.reflect.Array.getLength(array)); Trace.traceEnd(RenderScript.TRACE_TAG); } @@ -1006,10 +1065,9 @@ public class Allocation extends BaseObj { * @param data to be placed into the Allocation */ public void copy2DRangeFrom(int xoff, int yoff, int w, int h, byte[] data) { - Trace.traceBegin(RenderScript.TRACE_TAG, "copy2DRangeFrom"); validateIsInt8(); - copy2DRangeFromUnchecked(xoff, yoff, w, h, data); - Trace.traceEnd(RenderScript.TRACE_TAG); + copy2DRangeFromUnchecked(xoff, yoff, w, h, data, + Element.DataType.SIGNED_8, data.length); } /** @@ -1023,10 +1081,9 @@ public class Allocation extends BaseObj { * @param data to be placed into the Allocation */ public void copy2DRangeFrom(int xoff, int yoff, int w, int h, short[] data) { - Trace.traceBegin(RenderScript.TRACE_TAG, "copy2DRangeFrom"); validateIsInt16(); - copy2DRangeFromUnchecked(xoff, yoff, w, h, data); - Trace.traceEnd(RenderScript.TRACE_TAG); + copy2DRangeFromUnchecked(xoff, yoff, w, h, data, + Element.DataType.SIGNED_16, data.length); } /** @@ -1040,10 +1097,9 @@ public class Allocation extends BaseObj { * @param data to be placed into the Allocation */ public void copy2DRangeFrom(int xoff, int yoff, int w, int h, int[] data) { - Trace.traceBegin(RenderScript.TRACE_TAG, "copy2DRangeFrom"); validateIsInt32(); - copy2DRangeFromUnchecked(xoff, yoff, w, h, data); - Trace.traceEnd(RenderScript.TRACE_TAG); + copy2DRangeFromUnchecked(xoff, yoff, w, h, data, + Element.DataType.SIGNED_32, data.length); } /** @@ -1057,10 +1113,9 @@ public class Allocation extends BaseObj { * @param data to be placed into the Allocation */ public void copy2DRangeFrom(int xoff, int yoff, int w, int h, float[] data) { - Trace.traceBegin(RenderScript.TRACE_TAG, "copy2DRangeFrom"); validateIsFloat32(); - copy2DRangeFromUnchecked(xoff, yoff, w, h, data); - Trace.traceEnd(RenderScript.TRACE_TAG); + copy2DRangeFromUnchecked(xoff, yoff, w, h, data, + Element.DataType.FLOAT_32, data.length); } /** @@ -1133,47 +1188,16 @@ public class Allocation extends BaseObj { * @hide * */ - void copy3DRangeFromUnchecked(int xoff, int yoff, int zoff, int w, int h, int d, byte[] data) { - mRS.validate(); - validate3DRange(xoff, yoff, zoff, w, h, d); - mRS.nAllocationData3D(getIDSafe(), xoff, yoff, zoff, mSelectedLOD, - w, h, d, data, data.length); - } - - /** - * @hide - * - */ - void copy3DRangeFromUnchecked(int xoff, int yoff, int zoff, int w, int h, int d, short[] data) { + private void copy3DRangeFromUnchecked(int xoff, int yoff, int zoff, int w, int h, int d, + Object array, Element.DataType dt, int arrayLen) { + Trace.traceBegin(RenderScript.TRACE_TAG, "copy3DRangeFromUnchecked"); mRS.validate(); validate3DRange(xoff, yoff, zoff, w, h, d); - mRS.nAllocationData3D(getIDSafe(), xoff, yoff, zoff, mSelectedLOD, - w, h, d, data, data.length * 2); - } - - /** - * @hide - * - */ - void copy3DRangeFromUnchecked(int xoff, int yoff, int zoff, int w, int h, int d, int[] data) { - mRS.validate(); - validate3DRange(xoff, yoff, zoff, w, h, d); - mRS.nAllocationData3D(getIDSafe(), xoff, yoff, zoff, mSelectedLOD, - w, h, d, data, data.length * 4); - } - - /** - * @hide - * - */ - void copy3DRangeFromUnchecked(int xoff, int yoff, int zoff, int w, int h, int d, float[] data) { - mRS.validate(); - validate3DRange(xoff, yoff, zoff, w, h, d); - mRS.nAllocationData3D(getIDSafe(), xoff, yoff, zoff, mSelectedLOD, - w, h, d, data, data.length * 4); + mRS.nAllocationData3D(getIDSafe(), xoff, yoff, zoff, mSelectedLOD, w, h, d, + array, arrayLen * dt.mSize, dt); + Trace.traceEnd(RenderScript.TRACE_TAG); } - /** * @hide * Copy a rectangular region from the array into the allocation. @@ -1187,36 +1211,12 @@ public class Allocation extends BaseObj { * @param d Depth of the region to update * @param data to be placed into the allocation */ - public void copy3DRangeFrom(int xoff, int yoff, int zoff, int w, int h, int d, byte[] data) { - validateIsInt8(); - copy3DRangeFromUnchecked(xoff, yoff, zoff, w, h, d, data); - } - - /** - * @hide - * - */ - public void copy3DRangeFrom(int xoff, int yoff, int zoff, int w, int h, int d, short[] data) { - validateIsInt16(); - copy3DRangeFromUnchecked(xoff, yoff, zoff, w, h, d, data); - } - - /** - * @hide - * - */ - public void copy3DRangeFrom(int xoff, int yoff, int zoff, int w, int h, int d, int[] data) { - validateIsInt32(); - copy3DRangeFromUnchecked(xoff, yoff, zoff, w, h, d, data); - } - - /** - * @hide - * - */ - public void copy3DRangeFrom(int xoff, int yoff, int zoff, int w, int h, int d, float[] data) { - validateIsFloat32(); - copy3DRangeFromUnchecked(xoff, yoff, zoff, w, h, d, data); + public void copy3DRangeFrom(int xoff, int yoff, int zoff, int w, int h, int d, Object array) { + Trace.traceBegin(RenderScript.TRACE_TAG, "copy3DRangeFrom"); + copy3DRangeFromUnchecked(xoff, yoff, zoff, w, h, d, array, + validateObjectIsPrimitiveArray(array, true), + java.lang.reflect.Array.getLength(array)); + Trace.traceEnd(RenderScript.TRACE_TAG); } /** @@ -1260,6 +1260,27 @@ public class Allocation extends BaseObj { Trace.traceEnd(RenderScript.TRACE_TAG); } + private void copyTo(Object array, Element.DataType dt, int arrayLen) { + Trace.traceBegin(RenderScript.TRACE_TAG, "copyTo"); + mRS.validate(); + mRS.nAllocationRead(getID(mRS), array, dt); + Trace.traceEnd(RenderScript.TRACE_TAG); + } + + /** + * Copy from the Allocation into an array. The array must be at + * least as large as the Allocation. The + * {@link android.renderscript.Element} must match the component + * type of the array passed in. + * + * @param array The array to be set from the Allocation. + * @hide + */ + public void copyTo(Object array) { + copyTo(array, validateObjectIsPrimitiveArray(array, true), + java.lang.reflect.Array.getLength(array)); + } + /** * Copy from the Allocation into a byte array. The array must be at least * as large as the Allocation. The allocation must be of an 8 bit integer @@ -1268,11 +1289,8 @@ public class Allocation extends BaseObj { * @param d The array to be set from the Allocation. */ public void copyTo(byte[] d) { - Trace.traceBegin(RenderScript.TRACE_TAG, "copyTo"); validateIsInt8(); - mRS.validate(); - mRS.nAllocationRead(getID(mRS), d); - Trace.traceEnd(RenderScript.TRACE_TAG); + copyTo(d, Element.DataType.SIGNED_8, d.length); } /** @@ -1283,11 +1301,8 @@ public class Allocation extends BaseObj { * @param d The array to be set from the Allocation. */ public void copyTo(short[] d) { - Trace.traceBegin(RenderScript.TRACE_TAG, "copyTo"); validateIsInt16(); - mRS.validate(); - mRS.nAllocationRead(getID(mRS), d); - Trace.traceEnd(RenderScript.TRACE_TAG); + copyTo(d, Element.DataType.SIGNED_16, d.length); } /** @@ -1298,11 +1313,8 @@ public class Allocation extends BaseObj { * @param d The array to be set from the Allocation. */ public void copyTo(int[] d) { - Trace.traceBegin(RenderScript.TRACE_TAG, "copyTo"); validateIsInt32(); - mRS.validate(); - mRS.nAllocationRead(getID(mRS), d); - Trace.traceEnd(RenderScript.TRACE_TAG); + copyTo(d, Element.DataType.SIGNED_32, d.length); } /** @@ -1313,11 +1325,8 @@ public class Allocation extends BaseObj { * @param d The array to be set from the Allocation. */ public void copyTo(float[] d) { - Trace.traceBegin(RenderScript.TRACE_TAG, "copyTo"); validateIsFloat32(); - mRS.validate(); - mRS.nAllocationRead(getID(mRS), d); - Trace.traceEnd(RenderScript.TRACE_TAG); + copyTo(d, Element.DataType.FLOAT_32, d.length); } /** @@ -1342,7 +1351,7 @@ public class Allocation extends BaseObj { mRS.nAllocationResize1D(getID(mRS), dimX); mRS.finish(); // Necessary because resize is fifoed and update is async. - int typeID = mRS.nAllocationGetType(getID(mRS)); + long typeID = mRS.nAllocationGetType(getID(mRS)); mType = new Type(typeID, mRS); mType.updateFromNative(); updateCacheInfo(mType); @@ -1372,7 +1381,7 @@ public class Allocation extends BaseObj { if (type.getID(rs) == 0) { throw new RSInvalidStateException("Bad Type"); } - int id = rs.nAllocationCreateTyped(type.getID(rs), mips.mID, usage, 0); + long id = rs.nAllocationCreateTyped(type.getID(rs), mips.mID, usage, 0); if (id == 0) { throw new RSRuntimeException("Allocation creation failed."); } @@ -1427,7 +1436,7 @@ public class Allocation extends BaseObj { b.setX(count); Type t = b.create(); - int id = rs.nAllocationCreateTyped(t.getID(rs), MipmapControl.MIPMAP_NONE.mID, usage, 0); + long id = rs.nAllocationCreateTyped(t.getID(rs), MipmapControl.MIPMAP_NONE.mID, usage, 0); if (id == 0) { throw new RSRuntimeException("Allocation creation failed."); } @@ -1511,7 +1520,7 @@ public class Allocation extends BaseObj { if (mips == MipmapControl.MIPMAP_NONE && t.getElement().isCompatible(Element.RGBA_8888(rs)) && usage == (USAGE_SHARED | USAGE_SCRIPT | USAGE_GRAPHICS_TEXTURE)) { - int id = rs.nAllocationCreateBitmapBackedAllocation(t.getID(rs), mips.mID, b, usage); + long id = rs.nAllocationCreateBitmapBackedAllocation(t.getID(rs), mips.mID, b, usage); if (id == 0) { throw new RSRuntimeException("Load failed."); } @@ -1523,7 +1532,7 @@ public class Allocation extends BaseObj { } - int id = rs.nAllocationCreateFromBitmap(t.getID(rs), mips.mID, b, usage); + long id = rs.nAllocationCreateFromBitmap(t.getID(rs), mips.mID, b, usage); if (id == 0) { throw new RSRuntimeException("Load failed."); } @@ -1547,13 +1556,6 @@ public class Allocation extends BaseObj { } /** - * @hide - */ - public void setSurfaceTexture(SurfaceTexture st) { - setSurface(new Surface(st)); - } - - /** * Associate a {@link android.view.Surface} with this Allocation. This * operation is only valid for Allocations with {@link #USAGE_IO_OUTPUT}. * @@ -1633,7 +1635,7 @@ public class Allocation extends BaseObj { tb.setMipmaps(mips == MipmapControl.MIPMAP_FULL); Type t = tb.create(); - int id = rs.nAllocationCubeCreateFromBitmap(t.getID(rs), mips.mID, b, usage); + long id = rs.nAllocationCubeCreateFromBitmap(t.getID(rs), mips.mID, b, usage); if(id == 0) { throw new RSRuntimeException("Load failed for bitmap " + b + " element " + e); } @@ -1858,14 +1860,14 @@ public class Allocation extends BaseObj { */ public void setOnBufferAvailableListener(OnBufferAvailableListener callback) { synchronized(mAllocationMap) { - mAllocationMap.put(new Integer(getID(mRS)), this); + mAllocationMap.put(new Long(getID(mRS)), this); mBufferNotifier = callback; } } static void sendBufferNotification(int id) { synchronized(mAllocationMap) { - Allocation a = mAllocationMap.get(new Integer(id)); + Allocation a = mAllocationMap.get(new Long(id)); if ((a != null) && (a.mBufferNotifier != null)) { a.mBufferNotifier.onBufferAvailable(a); diff --git a/graphics/java/android/renderscript/AllocationAdapter.java b/rs/java/android/renderscript/AllocationAdapter.java index a6645bb..b77d087 100644 --- a/graphics/java/android/renderscript/AllocationAdapter.java +++ b/rs/java/android/renderscript/AllocationAdapter.java @@ -26,12 +26,12 @@ import android.util.TypedValue; * **/ public class AllocationAdapter extends Allocation { - AllocationAdapter(int id, RenderScript rs, Allocation alloc) { + AllocationAdapter(long id, RenderScript rs, Allocation alloc) { super(id, rs, alloc.mType, alloc.mUsage); mAdaptedAllocation = alloc; } - int getID(RenderScript rs) { + long getID(RenderScript rs) { throw new RSInvalidStateException( "This operation is not supported with adapters at this time."); } diff --git a/graphics/java/android/renderscript/BaseObj.java b/rs/java/android/renderscript/BaseObj.java index e17d79a..842aa23 100644 --- a/graphics/java/android/renderscript/BaseObj.java +++ b/rs/java/android/renderscript/BaseObj.java @@ -16,7 +16,7 @@ package android.renderscript; -import android.util.Log; +import java.util.concurrent.locks.ReentrantReadWriteLock; /** * BaseObj is the base class for all RenderScript objects owned by a RS context. @@ -25,14 +25,14 @@ import android.util.Log; * **/ public class BaseObj { - BaseObj(int id, RenderScript rs) { + BaseObj(long id, RenderScript rs) { rs.validate(); mRS = rs; mID = id; mDestroyed = false; } - void setID(int id) { + void setID(long id) { if (mID != 0) { throw new RSRuntimeException("Internal Error, reset of object ID."); } @@ -46,9 +46,9 @@ public class BaseObj { * @param rs Context to verify against internal context for * match. * - * @return int + * @return long */ - int getID(RenderScript rs) { + long getID(RenderScript rs) { mRS.validate(); if (mDestroyed) { throw new RSInvalidStateException("using a destroyed object."); @@ -68,7 +68,7 @@ public class BaseObj { } } - private int mID; + private long mID; private boolean mDestroyed; private String mName; RenderScript mRS; @@ -109,17 +109,30 @@ public class BaseObj { return mName; } - protected void finalize() throws Throwable { - if (!mDestroyed) { - if(mID != 0 && mRS.isAlive()) { + private void helpDestroy() { + boolean shouldDestroy = false; + synchronized(this) { + if (!mDestroyed) { + shouldDestroy = true; + mDestroyed = true; + } + } + + if (shouldDestroy) { + // must include nObjDestroy in the critical section + ReentrantReadWriteLock.ReadLock rlock = mRS.mRWLock.readLock(); + rlock.lock(); + if(mRS.isAlive()) { mRS.nObjDestroy(mID); } + rlock.unlock(); mRS = null; mID = 0; - mDestroyed = true; - //Log.v(RenderScript.LOG_TAG, getClass() + - // " auto finalizing object without having released the RS reference."); } + } + + protected void finalize() throws Throwable { + helpDestroy(); super.finalize(); } @@ -128,12 +141,11 @@ public class BaseObj { * primary use is to force immediate cleanup of resources when it is * believed the GC will not respond quickly enough. */ - synchronized public void destroy() { + public void destroy() { if(mDestroyed) { throw new RSInvalidStateException("Object already destroyed."); } - mDestroyed = true; - mRS.nObjDestroy(mID); + helpDestroy(); } /** @@ -152,7 +164,7 @@ public class BaseObj { */ @Override public int hashCode() { - return mID; + return (int)((mID & 0xfffffff) ^ (mID >> 32)); } /** diff --git a/graphics/java/android/renderscript/Byte2.java b/rs/java/android/renderscript/Byte2.java index f796de3..f796de3 100644 --- a/graphics/java/android/renderscript/Byte2.java +++ b/rs/java/android/renderscript/Byte2.java diff --git a/graphics/java/android/renderscript/Byte3.java b/rs/java/android/renderscript/Byte3.java index f2a95ac..f2a95ac 100644 --- a/graphics/java/android/renderscript/Byte3.java +++ b/rs/java/android/renderscript/Byte3.java diff --git a/graphics/java/android/renderscript/Byte4.java b/rs/java/android/renderscript/Byte4.java index b8a8a6b..b8a8a6b 100644 --- a/graphics/java/android/renderscript/Byte4.java +++ b/rs/java/android/renderscript/Byte4.java diff --git a/graphics/java/android/renderscript/Double2.java b/rs/java/android/renderscript/Double2.java index 4c7319d..4c7319d 100644 --- a/graphics/java/android/renderscript/Double2.java +++ b/rs/java/android/renderscript/Double2.java diff --git a/graphics/java/android/renderscript/Double3.java b/rs/java/android/renderscript/Double3.java index b819716..b819716 100644 --- a/graphics/java/android/renderscript/Double3.java +++ b/rs/java/android/renderscript/Double3.java diff --git a/graphics/java/android/renderscript/Double4.java b/rs/java/android/renderscript/Double4.java index e4829f7..e4829f7 100644 --- a/graphics/java/android/renderscript/Double4.java +++ b/rs/java/android/renderscript/Double4.java diff --git a/graphics/java/android/renderscript/Element.java b/rs/java/android/renderscript/Element.java index 68badfa..2932770 100644 --- a/graphics/java/android/renderscript/Element.java +++ b/rs/java/android/renderscript/Element.java @@ -759,7 +759,7 @@ public class Element extends BaseObj { return rs.mElement_MATRIX_2X2; } - Element(int id, RenderScript rs, Element[] e, String[] n, int[] as) { + Element(long id, RenderScript rs, Element[] e, String[] n, int[] as) { super(id, rs); mSize = 0; mVectorSize = 1; @@ -776,7 +776,7 @@ public class Element extends BaseObj { updateVisibleSubElements(); } - Element(int id, RenderScript rs, DataType dt, DataKind dk, boolean norm, int size) { + Element(long id, RenderScript rs, DataType dt, DataKind dk, boolean norm, int size) { super(id, rs); if ((dt != DataType.UNSIGNED_5_6_5) && (dt != DataType.UNSIGNED_4_4_4_4) && @@ -795,7 +795,7 @@ public class Element extends BaseObj { mVectorSize = size; } - Element(int id, RenderScript rs) { + Element(long id, RenderScript rs) { super(id, rs); } @@ -803,6 +803,8 @@ public class Element extends BaseObj { void updateFromNative() { super.updateFromNative(); + // FIXME: updateFromNative is broken in JNI for 64-bit + // we will pack mType; mKind; mNormalized; mVectorSize; NumSubElements int[] dataBuffer = new int[5]; mRS.nElementGetNativeData(getID(mRS), dataBuffer); @@ -853,7 +855,7 @@ public class Element extends BaseObj { DataKind dk = DataKind.USER; boolean norm = false; int vecSize = 1; - int id = rs.nElementCreate(dt.mID, dk.mID, norm, vecSize); + long id = rs.nElementCreate(dt.mID, dk.mID, norm, vecSize); return new Element(id, rs, dt, dk, norm, vecSize); } @@ -890,7 +892,7 @@ public class Element extends BaseObj { case BOOLEAN: { DataKind dk = DataKind.USER; boolean norm = false; - int id = rs.nElementCreate(dt.mID, dk.mID, norm, size); + long id = rs.nElementCreate(dt.mID, dk.mID, norm, size); return new Element(id, rs, dt, dk, norm, size); } @@ -961,7 +963,7 @@ public class Element extends BaseObj { } boolean norm = true; - int id = rs.nElementCreate(dt.mID, dk.mID, norm, size); + long id = rs.nElementCreate(dt.mID, dk.mID, norm, size); return new Element(id, rs, dt, dk, norm, size); } @@ -1088,11 +1090,12 @@ public class Element extends BaseObj { java.lang.System.arraycopy(mElementNames, 0, sin, 0, mCount); java.lang.System.arraycopy(mArraySizes, 0, asin, 0, mCount); + // FIXME: broken for 64-bit int[] ids = new int[ein.length]; for (int ct = 0; ct < ein.length; ct++ ) { - ids[ct] = ein[ct].getID(mRS); + ids[ct] = (int)ein[ct].getID(mRS); } - int id = mRS.nElementCreate2(ids, sin, asin); + long id = mRS.nElementCreate2(ids, sin, asin); return new Element(id, mRS, ein, sin, asin); } } diff --git a/graphics/java/android/renderscript/FieldPacker.java b/rs/java/android/renderscript/FieldPacker.java index fed97d6..cf20e63 100644 --- a/graphics/java/android/renderscript/FieldPacker.java +++ b/rs/java/android/renderscript/FieldPacker.java @@ -232,7 +232,8 @@ public class FieldPacker { public void addObj(BaseObj obj) { if (obj != null) { - addI32(obj.getID(null)); + // FIXME: this is fine for 32-bit but needs a path for 64-bit + addI32((int)obj.getID(null)); } else { addI32(0); } diff --git a/graphics/java/android/renderscript/FileA3D.java b/rs/java/android/renderscript/FileA3D.java index e41f02d..04bc7c6 100644 --- a/graphics/java/android/renderscript/FileA3D.java +++ b/rs/java/android/renderscript/FileA3D.java @@ -80,7 +80,7 @@ public class FileA3D extends BaseObj { public static class IndexEntry { RenderScript mRS; int mIndex; - int mID; + long mID; String mName; EntryType mEntryType; BaseObj mLoadedObj; @@ -141,7 +141,7 @@ public class FileA3D extends BaseObj { return null; } - int objectID = rs.nFileA3DGetEntryByIndex(entry.mID, entry.mIndex); + long objectID = rs.nFileA3DGetEntryByIndex(entry.mID, entry.mIndex); if(objectID == 0) { return null; } @@ -156,7 +156,7 @@ public class FileA3D extends BaseObj { return entry.mLoadedObj; } - IndexEntry(RenderScript rs, int index, int id, String name, EntryType type) { + IndexEntry(RenderScript rs, int index, long id, String name, EntryType type) { mRS = rs; mIndex = index; mID = id; @@ -169,7 +169,7 @@ public class FileA3D extends BaseObj { IndexEntry[] mFileEntries; InputStream mInputStream; - FileA3D(int id, RenderScript rs, InputStream stream) { + FileA3D(long id, RenderScript rs, InputStream stream) { super(id, rs); mInputStream = stream; } @@ -232,7 +232,7 @@ public class FileA3D extends BaseObj { */ static public FileA3D createFromAsset(RenderScript rs, AssetManager mgr, String path) { rs.validate(); - int fileId = rs.nFileA3DCreateFromAsset(mgr, path); + long fileId = rs.nFileA3DCreateFromAsset(mgr, path); if(fileId == 0) { throw new RSRuntimeException("Unable to create a3d file from asset " + path); @@ -252,7 +252,7 @@ public class FileA3D extends BaseObj { * @return a3d file containing renderscript objects */ static public FileA3D createFromFile(RenderScript rs, String path) { - int fileId = rs.nFileA3DCreateFromFile(path); + long fileId = rs.nFileA3DCreateFromFile(path); if(fileId == 0) { throw new RSRuntimeException("Unable to create a3d file from " + path); @@ -295,9 +295,9 @@ public class FileA3D extends BaseObj { throw new RSRuntimeException("Unable to open resource " + id); } - int fileId = 0; + long fileId = 0; if (is instanceof AssetManager.AssetInputStream) { - int asset = ((AssetManager.AssetInputStream) is).getAssetInt(); + long asset = ((AssetManager.AssetInputStream) is).getNativeAsset(); fileId = rs.nFileA3DCreateFromAssetStream(asset); } else { throw new RSRuntimeException("Unsupported asset stream"); diff --git a/graphics/java/android/renderscript/Float2.java b/rs/java/android/renderscript/Float2.java index 26193d2..26193d2 100644 --- a/graphics/java/android/renderscript/Float2.java +++ b/rs/java/android/renderscript/Float2.java diff --git a/graphics/java/android/renderscript/Float3.java b/rs/java/android/renderscript/Float3.java index 555bdf6..555bdf6 100644 --- a/graphics/java/android/renderscript/Float3.java +++ b/rs/java/android/renderscript/Float3.java diff --git a/graphics/java/android/renderscript/Float4.java b/rs/java/android/renderscript/Float4.java index 6541b2e..6541b2e 100644 --- a/graphics/java/android/renderscript/Float4.java +++ b/rs/java/android/renderscript/Float4.java diff --git a/graphics/java/android/renderscript/Font.java b/rs/java/android/renderscript/Font.java index 0375d2b..cfd11c0 100644 --- a/graphics/java/android/renderscript/Font.java +++ b/rs/java/android/renderscript/Font.java @@ -151,7 +151,7 @@ public class Font extends BaseObj { return "DroidSans.ttf"; } - Font(int id, RenderScript rs) { + Font(long id, RenderScript rs) { super(id, rs); } @@ -162,7 +162,7 @@ public class Font extends BaseObj { static public Font createFromFile(RenderScript rs, Resources res, String path, float pointSize) { rs.validate(); int dpi = res.getDisplayMetrics().densityDpi; - int fontId = rs.nFontCreateFromFile(path, pointSize, dpi); + long fontId = rs.nFontCreateFromFile(path, pointSize, dpi); if(fontId == 0) { throw new RSRuntimeException("Unable to create font from file " + path); @@ -187,7 +187,7 @@ public class Font extends BaseObj { AssetManager mgr = res.getAssets(); int dpi = res.getDisplayMetrics().densityDpi; - int fontId = rs.nFontCreateFromAsset(mgr, path, pointSize, dpi); + long fontId = rs.nFontCreateFromAsset(mgr, path, pointSize, dpi); if(fontId == 0) { throw new RSRuntimeException("Unable to create font from asset " + path); } @@ -211,9 +211,9 @@ public class Font extends BaseObj { int dpi = res.getDisplayMetrics().densityDpi; - int fontId = 0; + long fontId = 0; if (is instanceof AssetManager.AssetInputStream) { - int asset = ((AssetManager.AssetInputStream) is).getAssetInt(); + long asset = ((AssetManager.AssetInputStream) is).getNativeAsset(); fontId = rs.nFontCreateFromAssetStream(name, pointSize, dpi, asset); } else { throw new RSRuntimeException("Unsupported asset stream created"); diff --git a/graphics/java/android/renderscript/Int2.java b/rs/java/android/renderscript/Int2.java index 120957b..120957b 100644 --- a/graphics/java/android/renderscript/Int2.java +++ b/rs/java/android/renderscript/Int2.java diff --git a/graphics/java/android/renderscript/Int3.java b/rs/java/android/renderscript/Int3.java index c770395..c770395 100644 --- a/graphics/java/android/renderscript/Int3.java +++ b/rs/java/android/renderscript/Int3.java diff --git a/graphics/java/android/renderscript/Int4.java b/rs/java/android/renderscript/Int4.java index 1c0e2e2..1c0e2e2 100644 --- a/graphics/java/android/renderscript/Int4.java +++ b/rs/java/android/renderscript/Int4.java diff --git a/graphics/java/android/renderscript/Long2.java b/rs/java/android/renderscript/Long2.java index fabf204..fabf204 100644 --- a/graphics/java/android/renderscript/Long2.java +++ b/rs/java/android/renderscript/Long2.java diff --git a/graphics/java/android/renderscript/Long3.java b/rs/java/android/renderscript/Long3.java index 88ff855..88ff855 100644 --- a/graphics/java/android/renderscript/Long3.java +++ b/rs/java/android/renderscript/Long3.java diff --git a/graphics/java/android/renderscript/Long4.java b/rs/java/android/renderscript/Long4.java index 757b910..1a1ad74 100644 --- a/graphics/java/android/renderscript/Long4.java +++ b/rs/java/android/renderscript/Long4.java @@ -505,7 +505,7 @@ public class Long4 { * @param data * @param offset */ - public void copyTo(Long[] data, int offset) { + public void copyTo(long[] data, int offset) { data[offset] = (long)(x); data[offset + 1] = (long)(y); data[offset + 2] = (long)(z); diff --git a/graphics/java/android/renderscript/Matrix2f.java b/rs/java/android/renderscript/Matrix2f.java index d3621fa..d3621fa 100644 --- a/graphics/java/android/renderscript/Matrix2f.java +++ b/rs/java/android/renderscript/Matrix2f.java diff --git a/graphics/java/android/renderscript/Matrix3f.java b/rs/java/android/renderscript/Matrix3f.java index 8c3c330..8c3c330 100644 --- a/graphics/java/android/renderscript/Matrix3f.java +++ b/rs/java/android/renderscript/Matrix3f.java diff --git a/graphics/java/android/renderscript/Matrix4f.java b/rs/java/android/renderscript/Matrix4f.java index cd18e30..cd18e30 100644 --- a/graphics/java/android/renderscript/Matrix4f.java +++ b/rs/java/android/renderscript/Matrix4f.java diff --git a/graphics/java/android/renderscript/Mesh.java b/rs/java/android/renderscript/Mesh.java index bca4aa3..9ce3fb2 100644 --- a/graphics/java/android/renderscript/Mesh.java +++ b/rs/java/android/renderscript/Mesh.java @@ -91,7 +91,7 @@ public class Mesh extends BaseObj { Allocation[] mIndexBuffers; Primitive[] mPrimitives; - Mesh(int id, RenderScript rs) { + Mesh(long id, RenderScript rs) { super(id, rs); } @@ -367,7 +367,7 @@ public class Mesh extends BaseObj { alloc = Allocation.createSized(mRS, entry.e, entry.size, mUsage); } vertexBuffers[ct] = alloc; - vtx[ct] = alloc.getID(mRS); + vtx[ct] = (int)alloc.getID(mRS); } for(int ct = 0; ct < mIndexTypes.size(); ct ++) { @@ -378,15 +378,15 @@ public class Mesh extends BaseObj { } else if(entry.e != null) { alloc = Allocation.createSized(mRS, entry.e, entry.size, mUsage); } - int allocID = (alloc == null) ? 0 : alloc.getID(mRS); + long allocID = (alloc == null) ? 0 : alloc.getID(mRS); indexBuffers[ct] = alloc; primitives[ct] = entry.prim; - idx[ct] = allocID; + idx[ct] = (int)allocID; prim[ct] = entry.prim.mID; } - int id = mRS.nMeshCreate(vtx, idx, prim); + long id = mRS.nMeshCreate(vtx, idx, prim); Mesh newMesh = new Mesh(id, mRS); newMesh.mVertexBuffers = vertexBuffers; newMesh.mIndexBuffers = indexBuffers; @@ -517,20 +517,20 @@ public class Mesh extends BaseObj { for(int ct = 0; ct < mVertexTypeCount; ct ++) { Entry entry = mVertexTypes[ct]; vertexBuffers[ct] = entry.a; - vtx[ct] = entry.a.getID(mRS); + vtx[ct] = (int)entry.a.getID(mRS); } for(int ct = 0; ct < mIndexTypes.size(); ct ++) { Entry entry = (Entry)mIndexTypes.elementAt(ct); - int allocID = (entry.a == null) ? 0 : entry.a.getID(mRS); + long allocID = (entry.a == null) ? 0 : entry.a.getID(mRS); indexBuffers[ct] = entry.a; primitives[ct] = entry.prim; - idx[ct] = allocID; + idx[ct] = (int)allocID; prim[ct] = entry.prim.mID; } - int id = mRS.nMeshCreate(vtx, idx, prim); + long id = mRS.nMeshCreate(vtx, idx, prim); Mesh newMesh = new Mesh(id, mRS); newMesh.mVertexBuffers = vertexBuffers; newMesh.mIndexBuffers = indexBuffers; diff --git a/graphics/java/android/renderscript/Path.java b/rs/java/android/renderscript/Path.java index 9c4d41b..5cc67de 100644 --- a/graphics/java/android/renderscript/Path.java +++ b/rs/java/android/renderscript/Path.java @@ -41,7 +41,7 @@ public class Path extends BaseObj { float mQuality; boolean mCoverageToAlpha; - Path(int id, RenderScript rs, Primitive p, Allocation vtx, Allocation loop, float q) { + Path(long id, RenderScript rs, Primitive p, Allocation vtx, Allocation loop, float q) { super(id, rs); mVertexBuffer = vtx; mLoopBuffer = loop; @@ -67,7 +67,7 @@ public class Path extends BaseObj { public static Path createStaticPath(RenderScript rs, Primitive p, float quality, Allocation vtx) { - int id = rs.nPathCreate(p.mID, false, vtx.getID(rs), 0, quality); + long id = rs.nPathCreate(p.mID, false, vtx.getID(rs), 0, quality); Path newPath = new Path(id, rs, p, null, null, quality); return newPath; } diff --git a/graphics/java/android/renderscript/Program.java b/rs/java/android/renderscript/Program.java index bc2ca35..3eb9b75 100644 --- a/graphics/java/android/renderscript/Program.java +++ b/rs/java/android/renderscript/Program.java @@ -74,7 +74,7 @@ public class Program extends BaseObj { int mTextureCount; String mShader; - Program(int id, RenderScript rs) { + Program(long id, RenderScript rs) { super(id, rs); } @@ -150,7 +150,7 @@ public class Program extends BaseObj { a.getType().getID(mRS) != mConstants[slot].getID(mRS)) { throw new IllegalArgumentException("Allocation type does not match slot type."); } - int id = a != null ? a.getID(mRS) : 0; + long id = a != null ? a.getID(mRS) : 0; mRS.nProgramBindConstants(getID(mRS), slot, id); } @@ -172,7 +172,7 @@ public class Program extends BaseObj { throw new IllegalArgumentException("Cannot bind cubemap to 2d texture slot"); } - int id = va != null ? va.getID(mRS) : 0; + long id = va != null ? va.getID(mRS) : 0; mRS.nProgramBindTexture(getID(mRS), slot, id); } @@ -192,7 +192,7 @@ public class Program extends BaseObj { throw new IllegalArgumentException("Slot ID out of range."); } - int id = vs != null ? vs.getID(mRS) : 0; + long id = vs != null ? vs.getID(mRS) : 0; mRS.nProgramBindSampler(getID(mRS), slot, id); } diff --git a/graphics/java/android/renderscript/ProgramFragment.java b/rs/java/android/renderscript/ProgramFragment.java index b9ba3fd..5e886a3 100644 --- a/graphics/java/android/renderscript/ProgramFragment.java +++ b/rs/java/android/renderscript/ProgramFragment.java @@ -39,7 +39,7 @@ import android.util.Log; * **/ public class ProgramFragment extends Program { - ProgramFragment(int id, RenderScript rs) { + ProgramFragment(long id, RenderScript rs) { super(id, rs); } @@ -71,23 +71,23 @@ public class ProgramFragment extends Program { for (int i=0; i < mInputCount; i++) { tmp[idx++] = ProgramParam.INPUT.mID; - tmp[idx++] = mInputs[i].getID(mRS); + tmp[idx++] = (int)mInputs[i].getID(mRS); } for (int i=0; i < mOutputCount; i++) { tmp[idx++] = ProgramParam.OUTPUT.mID; - tmp[idx++] = mOutputs[i].getID(mRS); + tmp[idx++] = (int)mOutputs[i].getID(mRS); } for (int i=0; i < mConstantCount; i++) { tmp[idx++] = ProgramParam.CONSTANT.mID; - tmp[idx++] = mConstants[i].getID(mRS); + tmp[idx++] = (int)mConstants[i].getID(mRS); } for (int i=0; i < mTextureCount; i++) { tmp[idx++] = ProgramParam.TEXTURE_TYPE.mID; - tmp[idx++] = mTextureTypes[i].mID; + tmp[idx++] = (int)mTextureTypes[i].mID; texNames[i] = mTextureNames[i]; } - int id = mRS.nProgramFragmentCreate(mShader, texNames, tmp); + long id = mRS.nProgramFragmentCreate(mShader, texNames, tmp); ProgramFragment pf = new ProgramFragment(id, mRS); initProgram(pf); return pf; diff --git a/graphics/java/android/renderscript/ProgramFragmentFixedFunction.java b/rs/java/android/renderscript/ProgramFragmentFixedFunction.java index 8ae1777..22aed0a 100644 --- a/graphics/java/android/renderscript/ProgramFragmentFixedFunction.java +++ b/rs/java/android/renderscript/ProgramFragmentFixedFunction.java @@ -31,7 +31,7 @@ import android.util.Log; * **/ public class ProgramFragmentFixedFunction extends ProgramFragment { - ProgramFragmentFixedFunction(int id, RenderScript rs) { + ProgramFragmentFixedFunction(long id, RenderScript rs) { super(id, rs); } @@ -58,23 +58,23 @@ public class ProgramFragmentFixedFunction extends ProgramFragment { for (int i=0; i < mInputCount; i++) { tmp[idx++] = ProgramParam.INPUT.mID; - tmp[idx++] = mInputs[i].getID(mRS); + tmp[idx++] = (int)mInputs[i].getID(mRS); } for (int i=0; i < mOutputCount; i++) { tmp[idx++] = ProgramParam.OUTPUT.mID; - tmp[idx++] = mOutputs[i].getID(mRS); + tmp[idx++] = (int)mOutputs[i].getID(mRS); } for (int i=0; i < mConstantCount; i++) { tmp[idx++] = ProgramParam.CONSTANT.mID; - tmp[idx++] = mConstants[i].getID(mRS); + tmp[idx++] = (int)mConstants[i].getID(mRS); } for (int i=0; i < mTextureCount; i++) { tmp[idx++] = ProgramParam.TEXTURE_TYPE.mID; - tmp[idx++] = mTextureTypes[i].mID; + tmp[idx++] = (int)mTextureTypes[i].mID; texNames[i] = mTextureNames[i]; } - int id = mRS.nProgramFragmentCreate(mShader, texNames, tmp); + long id = mRS.nProgramFragmentCreate(mShader, texNames, tmp); ProgramFragmentFixedFunction pf = new ProgramFragmentFixedFunction(id, mRS); initProgram(pf); return pf; diff --git a/graphics/java/android/renderscript/ProgramRaster.java b/rs/java/android/renderscript/ProgramRaster.java index 216cb4e..e294b05 100644 --- a/graphics/java/android/renderscript/ProgramRaster.java +++ b/rs/java/android/renderscript/ProgramRaster.java @@ -54,7 +54,7 @@ public class ProgramRaster extends BaseObj { boolean mPointSprite; CullMode mCullMode; - ProgramRaster(int id, RenderScript rs) { + ProgramRaster(long id, RenderScript rs) { super(id, rs); mPointSprite = false; @@ -154,7 +154,7 @@ public class ProgramRaster extends BaseObj { */ public ProgramRaster create() { mRS.validate(); - int id = mRS.nProgramRasterCreate(mPointSprite, mCullMode.mID); + long id = mRS.nProgramRasterCreate(mPointSprite, mCullMode.mID); ProgramRaster programRaster = new ProgramRaster(id, mRS); programRaster.mPointSprite = mPointSprite; programRaster.mCullMode = mCullMode; diff --git a/graphics/java/android/renderscript/ProgramStore.java b/rs/java/android/renderscript/ProgramStore.java index dac9e76..969cc25 100644 --- a/graphics/java/android/renderscript/ProgramStore.java +++ b/rs/java/android/renderscript/ProgramStore.java @@ -146,7 +146,7 @@ public class ProgramStore extends BaseObj { BlendDstFunc mBlendDst; boolean mDither; - ProgramStore(int id, RenderScript rs) { + ProgramStore(long id, RenderScript rs) { super(id, rs); } @@ -421,7 +421,7 @@ public class ProgramStore extends BaseObj { */ public ProgramStore create() { mRS.validate(); - int id = mRS.nProgramStoreCreate(mColorMaskR, mColorMaskG, mColorMaskB, mColorMaskA, + long id = mRS.nProgramStoreCreate(mColorMaskR, mColorMaskG, mColorMaskB, mColorMaskA, mDepthMask, mDither, mBlendSrc.mID, mBlendDst.mID, mDepthFunc.mID); ProgramStore programStore = new ProgramStore(id, mRS); diff --git a/graphics/java/android/renderscript/ProgramVertex.java b/rs/java/android/renderscript/ProgramVertex.java index 1c5a191..b6886e1 100644 --- a/graphics/java/android/renderscript/ProgramVertex.java +++ b/rs/java/android/renderscript/ProgramVertex.java @@ -53,7 +53,7 @@ import android.util.Log; **/ public class ProgramVertex extends Program { - ProgramVertex(int id, RenderScript rs) { + ProgramVertex(long id, RenderScript rs) { super(id, rs); } @@ -132,23 +132,23 @@ public class ProgramVertex extends Program { for (int i=0; i < mInputCount; i++) { tmp[idx++] = ProgramParam.INPUT.mID; - tmp[idx++] = mInputs[i].getID(mRS); + tmp[idx++] = (int)mInputs[i].getID(mRS); } for (int i=0; i < mOutputCount; i++) { tmp[idx++] = ProgramParam.OUTPUT.mID; - tmp[idx++] = mOutputs[i].getID(mRS); + tmp[idx++] = (int)mOutputs[i].getID(mRS); } for (int i=0; i < mConstantCount; i++) { tmp[idx++] = ProgramParam.CONSTANT.mID; - tmp[idx++] = mConstants[i].getID(mRS); + tmp[idx++] = (int)mConstants[i].getID(mRS); } for (int i=0; i < mTextureCount; i++) { tmp[idx++] = ProgramParam.TEXTURE_TYPE.mID; - tmp[idx++] = mTextureTypes[i].mID; + tmp[idx++] = (int)mTextureTypes[i].mID; texNames[i] = mTextureNames[i]; } - int id = mRS.nProgramVertexCreate(mShader, texNames, tmp); + long id = mRS.nProgramVertexCreate(mShader, texNames, tmp); ProgramVertex pv = new ProgramVertex(id, mRS); initProgram(pv); return pv; diff --git a/graphics/java/android/renderscript/ProgramVertexFixedFunction.java b/rs/java/android/renderscript/ProgramVertexFixedFunction.java index ad486f3..c479c77 100644 --- a/graphics/java/android/renderscript/ProgramVertexFixedFunction.java +++ b/rs/java/android/renderscript/ProgramVertexFixedFunction.java @@ -31,7 +31,7 @@ import android.util.Log; **/ public class ProgramVertexFixedFunction extends ProgramVertex { - ProgramVertexFixedFunction(int id, RenderScript rs) { + ProgramVertexFixedFunction(long id, RenderScript rs) { super(id, rs); } @@ -85,23 +85,23 @@ public class ProgramVertexFixedFunction extends ProgramVertex { for (int i=0; i < mInputCount; i++) { tmp[idx++] = ProgramParam.INPUT.mID; - tmp[idx++] = mInputs[i].getID(mRS); + tmp[idx++] = (int)mInputs[i].getID(mRS); } for (int i=0; i < mOutputCount; i++) { tmp[idx++] = ProgramParam.OUTPUT.mID; - tmp[idx++] = mOutputs[i].getID(mRS); + tmp[idx++] = (int)mOutputs[i].getID(mRS); } for (int i=0; i < mConstantCount; i++) { tmp[idx++] = ProgramParam.CONSTANT.mID; - tmp[idx++] = mConstants[i].getID(mRS); + tmp[idx++] = (int)mConstants[i].getID(mRS); } for (int i=0; i < mTextureCount; i++) { tmp[idx++] = ProgramParam.TEXTURE_TYPE.mID; - tmp[idx++] = mTextureTypes[i].mID; + tmp[idx++] = (int)mTextureTypes[i].mID; texNames[i] = mTextureNames[i]; } - int id = mRS.nProgramVertexCreate(mShader, texNames, tmp); + long id = mRS.nProgramVertexCreate(mShader, texNames, tmp); ProgramVertexFixedFunction pv = new ProgramVertexFixedFunction(id, mRS); initProgram(pv); return pv; diff --git a/graphics/java/android/renderscript/RSDriverException.java b/rs/java/android/renderscript/RSDriverException.java index 9e6507f..9e6507f 100644 --- a/graphics/java/android/renderscript/RSDriverException.java +++ b/rs/java/android/renderscript/RSDriverException.java diff --git a/graphics/java/android/renderscript/RSIllegalArgumentException.java b/rs/java/android/renderscript/RSIllegalArgumentException.java index 5c68594..5c68594 100644 --- a/graphics/java/android/renderscript/RSIllegalArgumentException.java +++ b/rs/java/android/renderscript/RSIllegalArgumentException.java diff --git a/graphics/java/android/renderscript/RSInvalidStateException.java b/rs/java/android/renderscript/RSInvalidStateException.java index c881898..c881898 100644 --- a/graphics/java/android/renderscript/RSInvalidStateException.java +++ b/rs/java/android/renderscript/RSInvalidStateException.java diff --git a/graphics/java/android/renderscript/RSRuntimeException.java b/rs/java/android/renderscript/RSRuntimeException.java index b4b629e..b4b629e 100644 --- a/graphics/java/android/renderscript/RSRuntimeException.java +++ b/rs/java/android/renderscript/RSRuntimeException.java diff --git a/graphics/java/android/renderscript/RSSurfaceView.java b/rs/java/android/renderscript/RSSurfaceView.java index 308d97a..308d97a 100644 --- a/graphics/java/android/renderscript/RSSurfaceView.java +++ b/rs/java/android/renderscript/RSSurfaceView.java diff --git a/graphics/java/android/renderscript/RSTextureView.java b/rs/java/android/renderscript/RSTextureView.java index 7eeeeae..7eeeeae 100644 --- a/graphics/java/android/renderscript/RSTextureView.java +++ b/rs/java/android/renderscript/RSTextureView.java diff --git a/graphics/java/android/renderscript/RenderScript.java b/rs/java/android/renderscript/RenderScript.java index 7d4a5c4..8618764 100644 --- a/graphics/java/android/renderscript/RenderScript.java +++ b/rs/java/android/renderscript/RenderScript.java @@ -19,6 +19,7 @@ package android.renderscript; import java.io.File; import java.lang.reflect.Field; import java.lang.reflect.Method; +import java.util.concurrent.locks.ReentrantReadWriteLock; import android.content.Context; import android.content.pm.ApplicationInfo; @@ -91,14 +92,14 @@ public class RenderScript { } // Non-threadsafe functions. - native int nDeviceCreate(); - native void nDeviceDestroy(int dev); - native void nDeviceSetConfig(int dev, int param, int value); - native int nContextGetUserMessage(int con, int[] data); - native String nContextGetErrorMessage(int con); - native int nContextPeekMessage(int con, int[] subID); - native void nContextInitToClient(int con); - native void nContextDeinitToClient(int con); + native long nDeviceCreate(); + native void nDeviceDestroy(long dev); + native void nDeviceSetConfig(long dev, int param, int value); + native int nContextGetUserMessage(long con, int[] data); + native String nContextGetErrorMessage(long con); + native int nContextPeekMessage(long con, int[] subID); + native void nContextInitToClient(long con); + native void nContextDeinitToClient(long con); static File mCacheDir; @@ -151,16 +152,17 @@ public class RenderScript { } ContextType mContextType; + ReentrantReadWriteLock mRWLock; // Methods below are wrapped to protect the non-threadsafe // lockless fifo. - native int rsnContextCreateGL(int dev, int ver, int sdkVer, + native long rsnContextCreateGL(long dev, int ver, int sdkVer, int colorMin, int colorPref, int alphaMin, int alphaPref, int depthMin, int depthPref, int stencilMin, int stencilPref, int samplesMin, int samplesPref, float samplesQ, int dpi); - synchronized int nContextCreateGL(int dev, int ver, int sdkVer, + synchronized long nContextCreateGL(long dev, int ver, int sdkVer, int colorMin, int colorPref, int alphaMin, int alphaPref, int depthMin, int depthPref, @@ -171,100 +173,113 @@ public class RenderScript { stencilMin, stencilPref, samplesMin, samplesPref, samplesQ, dpi); } - native int rsnContextCreate(int dev, int ver, int sdkVer, int contextType); - synchronized int nContextCreate(int dev, int ver, int sdkVer, int contextType) { + native long rsnContextCreate(long dev, int ver, int sdkVer, int contextType); + synchronized long nContextCreate(long dev, int ver, int sdkVer, int contextType) { return rsnContextCreate(dev, ver, sdkVer, contextType); } - native void rsnContextDestroy(int con); + native void rsnContextDestroy(long con); synchronized void nContextDestroy() { validate(); - rsnContextDestroy(mContext); + + // take teardown lock + // teardown lock can only be taken when no objects are being destroyed + ReentrantReadWriteLock.WriteLock wlock = mRWLock.writeLock(); + wlock.lock(); + + long curCon = mContext; + // context is considered dead as of this point + mContext = 0; + + wlock.unlock(); + rsnContextDestroy(curCon); } - native void rsnContextSetSurface(int con, int w, int h, Surface sur); + native void rsnContextSetSurface(long con, int w, int h, Surface sur); synchronized void nContextSetSurface(int w, int h, Surface sur) { validate(); rsnContextSetSurface(mContext, w, h, sur); } - native void rsnContextSetSurfaceTexture(int con, int w, int h, SurfaceTexture sur); + native void rsnContextSetSurfaceTexture(long con, int w, int h, SurfaceTexture sur); synchronized void nContextSetSurfaceTexture(int w, int h, SurfaceTexture sur) { validate(); rsnContextSetSurfaceTexture(mContext, w, h, sur); } - native void rsnContextSetPriority(int con, int p); + native void rsnContextSetPriority(long con, int p); synchronized void nContextSetPriority(int p) { validate(); rsnContextSetPriority(mContext, p); } - native void rsnContextDump(int con, int bits); + native void rsnContextDump(long con, int bits); synchronized void nContextDump(int bits) { validate(); rsnContextDump(mContext, bits); } - native void rsnContextFinish(int con); + native void rsnContextFinish(long con); synchronized void nContextFinish() { validate(); rsnContextFinish(mContext); } - native void rsnContextSendMessage(int con, int id, int[] data); + native void rsnContextSendMessage(long con, int id, int[] data); synchronized void nContextSendMessage(int id, int[] data) { validate(); rsnContextSendMessage(mContext, id, data); } - native void rsnContextBindRootScript(int con, int script); + native void rsnContextBindRootScript(long con, int script); synchronized void nContextBindRootScript(int script) { validate(); rsnContextBindRootScript(mContext, script); } - native void rsnContextBindSampler(int con, int sampler, int slot); + native void rsnContextBindSampler(long con, int sampler, int slot); synchronized void nContextBindSampler(int sampler, int slot) { validate(); rsnContextBindSampler(mContext, sampler, slot); } - native void rsnContextBindProgramStore(int con, int pfs); + native void rsnContextBindProgramStore(long con, int pfs); synchronized void nContextBindProgramStore(int pfs) { validate(); rsnContextBindProgramStore(mContext, pfs); } - native void rsnContextBindProgramFragment(int con, int pf); + native void rsnContextBindProgramFragment(long con, int pf); synchronized void nContextBindProgramFragment(int pf) { validate(); rsnContextBindProgramFragment(mContext, pf); } - native void rsnContextBindProgramVertex(int con, int pv); + native void rsnContextBindProgramVertex(long con, int pv); synchronized void nContextBindProgramVertex(int pv) { validate(); rsnContextBindProgramVertex(mContext, pv); } - native void rsnContextBindProgramRaster(int con, int pr); + native void rsnContextBindProgramRaster(long con, int pr); synchronized void nContextBindProgramRaster(int pr) { validate(); rsnContextBindProgramRaster(mContext, pr); } - native void rsnContextPause(int con); + native void rsnContextPause(long con); synchronized void nContextPause() { validate(); rsnContextPause(mContext); } - native void rsnContextResume(int con); + native void rsnContextResume(long con); synchronized void nContextResume() { validate(); rsnContextResume(mContext); } - native void rsnAssignName(int con, int obj, byte[] name); - synchronized void nAssignName(int obj, byte[] name) { + native void rsnAssignName(long con, long obj, byte[] name); + synchronized void nAssignName(long obj, byte[] name) { validate(); rsnAssignName(mContext, obj, name); } - native String rsnGetName(int con, int obj); - synchronized String nGetName(int obj) { + native String rsnGetName(long con, long obj); + synchronized String nGetName(long obj) { validate(); return rsnGetName(mContext, obj); } - native void rsnObjDestroy(int con, int id); - synchronized void nObjDestroy(int id) { + + // nObjDestroy is explicitly _not_ synchronous to prevent crashes in finalizers + native void rsnObjDestroy(long con, long id); + void nObjDestroy(long id) { // There is a race condition here. The calling code may be run // by the gc while teardown is occuring. This protects againts // deleting dead objects. @@ -273,156 +288,140 @@ public class RenderScript { } } - native int rsnElementCreate(int con, int type, int kind, boolean norm, int vecSize); - synchronized int nElementCreate(int type, int kind, boolean norm, int vecSize) { + native long rsnElementCreate(long con, long type, int kind, boolean norm, int vecSize); + synchronized long nElementCreate(long type, int kind, boolean norm, int vecSize) { validate(); return rsnElementCreate(mContext, type, kind, norm, vecSize); } - native int rsnElementCreate2(int con, int[] elements, String[] names, int[] arraySizes); - synchronized int nElementCreate2(int[] elements, String[] names, int[] arraySizes) { + native long rsnElementCreate2(long con, int[]elements, String[] names, int[] arraySizes); + synchronized long nElementCreate2(int[] elements, String[] names, int[] arraySizes) { validate(); return rsnElementCreate2(mContext, elements, names, arraySizes); } - native void rsnElementGetNativeData(int con, int id, int[] elementData); - synchronized void nElementGetNativeData(int id, int[] elementData) { + native void rsnElementGetNativeData(long con, long id, int[] elementData); + synchronized void nElementGetNativeData(long id, int[] elementData) { validate(); rsnElementGetNativeData(mContext, id, elementData); } - native void rsnElementGetSubElements(int con, int id, + native void rsnElementGetSubElements(long con, long id, int[] IDs, String[] names, int[] arraySizes); - synchronized void nElementGetSubElements(int id, int[] IDs, String[] names, int[] arraySizes) { + synchronized void nElementGetSubElements(long id, int[] IDs, String[] names, int[] arraySizes) { validate(); rsnElementGetSubElements(mContext, id, IDs, names, arraySizes); } - native int rsnTypeCreate(int con, int eid, int x, int y, int z, boolean mips, boolean faces, int yuv); - synchronized int nTypeCreate(int eid, int x, int y, int z, boolean mips, boolean faces, int yuv) { + native long rsnTypeCreate(long con, long eid, int x, int y, int z, boolean mips, boolean faces, int yuv); + synchronized long nTypeCreate(long eid, int x, int y, int z, boolean mips, boolean faces, int yuv) { validate(); return rsnTypeCreate(mContext, eid, x, y, z, mips, faces, yuv); } - native void rsnTypeGetNativeData(int con, int id, int[] typeData); - synchronized void nTypeGetNativeData(int id, int[] typeData) { + native void rsnTypeGetNativeData(long con, long id, int[] typeData); + synchronized void nTypeGetNativeData(long id, int[] typeData) { validate(); rsnTypeGetNativeData(mContext, id, typeData); } - native int rsnAllocationCreateTyped(int con, int type, int mip, int usage, int pointer); - synchronized int nAllocationCreateTyped(int type, int mip, int usage, int pointer) { + native long rsnAllocationCreateTyped(long con, long type, int mip, int usage, int pointer); + synchronized long nAllocationCreateTyped(long type, int mip, int usage, int pointer) { validate(); return rsnAllocationCreateTyped(mContext, type, mip, usage, pointer); } - native int rsnAllocationCreateFromBitmap(int con, int type, int mip, Bitmap bmp, int usage); - synchronized int nAllocationCreateFromBitmap(int type, int mip, Bitmap bmp, int usage) { + native long rsnAllocationCreateFromBitmap(long con, long type, int mip, Bitmap bmp, int usage); + synchronized long nAllocationCreateFromBitmap(long type, int mip, Bitmap bmp, int usage) { validate(); return rsnAllocationCreateFromBitmap(mContext, type, mip, bmp, usage); } - native int rsnAllocationCreateBitmapBackedAllocation(int con, int type, int mip, Bitmap bmp, int usage); - synchronized int nAllocationCreateBitmapBackedAllocation(int type, int mip, Bitmap bmp, int usage) { + native long rsnAllocationCreateBitmapBackedAllocation(long con, long type, int mip, Bitmap bmp, int usage); + synchronized long nAllocationCreateBitmapBackedAllocation(long type, int mip, Bitmap bmp, int usage) { validate(); return rsnAllocationCreateBitmapBackedAllocation(mContext, type, mip, bmp, usage); } - - native int rsnAllocationCubeCreateFromBitmap(int con, int type, int mip, Bitmap bmp, int usage); - synchronized int nAllocationCubeCreateFromBitmap(int type, int mip, Bitmap bmp, int usage) { + native long rsnAllocationCubeCreateFromBitmap(long con, long type, int mip, Bitmap bmp, int usage); + synchronized long nAllocationCubeCreateFromBitmap(long type, int mip, Bitmap bmp, int usage) { validate(); return rsnAllocationCubeCreateFromBitmap(mContext, type, mip, bmp, usage); } - native int rsnAllocationCreateBitmapRef(int con, int type, Bitmap bmp); - synchronized int nAllocationCreateBitmapRef(int type, Bitmap bmp) { + native long rsnAllocationCreateBitmapRef(long con, long type, Bitmap bmp); + synchronized long nAllocationCreateBitmapRef(long type, Bitmap bmp) { validate(); return rsnAllocationCreateBitmapRef(mContext, type, bmp); } - native int rsnAllocationCreateFromAssetStream(int con, int mips, int assetStream, int usage); - synchronized int nAllocationCreateFromAssetStream(int mips, int assetStream, int usage) { + native long rsnAllocationCreateFromAssetStream(long con, int mips, int assetStream, int usage); + synchronized long nAllocationCreateFromAssetStream(int mips, int assetStream, int usage) { validate(); return rsnAllocationCreateFromAssetStream(mContext, mips, assetStream, usage); } - native void rsnAllocationCopyToBitmap(int con, int alloc, Bitmap bmp); - synchronized void nAllocationCopyToBitmap(int alloc, Bitmap bmp) { + native void rsnAllocationCopyToBitmap(long con, long alloc, Bitmap bmp); + synchronized void nAllocationCopyToBitmap(long alloc, Bitmap bmp) { validate(); rsnAllocationCopyToBitmap(mContext, alloc, bmp); } - native void rsnAllocationSyncAll(int con, int alloc, int src); - synchronized void nAllocationSyncAll(int alloc, int src) { + native void rsnAllocationSyncAll(long con, long alloc, int src); + synchronized void nAllocationSyncAll(long alloc, int src) { validate(); rsnAllocationSyncAll(mContext, alloc, src); } - native Surface rsnAllocationGetSurface(int con, int alloc); - synchronized Surface nAllocationGetSurface(int alloc) { + native Surface rsnAllocationGetSurface(long con, long alloc); + synchronized Surface nAllocationGetSurface(long alloc) { validate(); return rsnAllocationGetSurface(mContext, alloc); } - native void rsnAllocationSetSurface(int con, int alloc, Surface sur); - synchronized void nAllocationSetSurface(int alloc, Surface sur) { + native void rsnAllocationSetSurface(long con, long alloc, Surface sur); + synchronized void nAllocationSetSurface(long alloc, Surface sur) { validate(); rsnAllocationSetSurface(mContext, alloc, sur); } - native void rsnAllocationIoSend(int con, int alloc); - synchronized void nAllocationIoSend(int alloc) { + native void rsnAllocationIoSend(long con, long alloc); + synchronized void nAllocationIoSend(long alloc) { validate(); rsnAllocationIoSend(mContext, alloc); } - native void rsnAllocationIoReceive(int con, int alloc); - synchronized void nAllocationIoReceive(int alloc) { + native void rsnAllocationIoReceive(long con, long alloc); + synchronized void nAllocationIoReceive(long alloc) { validate(); rsnAllocationIoReceive(mContext, alloc); } - native void rsnAllocationGenerateMipmaps(int con, int alloc); - synchronized void nAllocationGenerateMipmaps(int alloc) { + native void rsnAllocationGenerateMipmaps(long con, long alloc); + synchronized void nAllocationGenerateMipmaps(long alloc) { validate(); rsnAllocationGenerateMipmaps(mContext, alloc); } - native void rsnAllocationCopyFromBitmap(int con, int alloc, Bitmap bmp); - synchronized void nAllocationCopyFromBitmap(int alloc, Bitmap bmp) { + native void rsnAllocationCopyFromBitmap(long con, long alloc, Bitmap bmp); + synchronized void nAllocationCopyFromBitmap(long alloc, Bitmap bmp) { validate(); rsnAllocationCopyFromBitmap(mContext, alloc, bmp); } - native void rsnAllocationData1D(int con, int id, int off, int mip, int count, int[] d, int sizeBytes); - synchronized void nAllocationData1D(int id, int off, int mip, int count, int[] d, int sizeBytes) { - validate(); - rsnAllocationData1D(mContext, id, off, mip, count, d, sizeBytes); - } - native void rsnAllocationData1D(int con, int id, int off, int mip, int count, short[] d, int sizeBytes); - synchronized void nAllocationData1D(int id, int off, int mip, int count, short[] d, int sizeBytes) { + native void rsnAllocationData1D(long con, long id, int off, int mip, int count, Object d, int sizeBytes, int dt); + synchronized void nAllocationData1D(long id, int off, int mip, int count, Object d, int sizeBytes, Element.DataType dt) { validate(); - rsnAllocationData1D(mContext, id, off, mip, count, d, sizeBytes); - } - native void rsnAllocationData1D(int con, int id, int off, int mip, int count, byte[] d, int sizeBytes); - synchronized void nAllocationData1D(int id, int off, int mip, int count, byte[] d, int sizeBytes) { - validate(); - rsnAllocationData1D(mContext, id, off, mip, count, d, sizeBytes); - } - native void rsnAllocationData1D(int con, int id, int off, int mip, int count, float[] d, int sizeBytes); - synchronized void nAllocationData1D(int id, int off, int mip, int count, float[] d, int sizeBytes) { - validate(); - rsnAllocationData1D(mContext, id, off, mip, count, d, sizeBytes); + rsnAllocationData1D(mContext, id, off, mip, count, d, sizeBytes, dt.mID); } - native void rsnAllocationElementData1D(int con, int id, int xoff, int mip, int compIdx, byte[] d, int sizeBytes); - synchronized void nAllocationElementData1D(int id, int xoff, int mip, int compIdx, byte[] d, int sizeBytes) { + native void rsnAllocationElementData1D(long con,long id, int xoff, int mip, int compIdx, byte[] d, int sizeBytes); + synchronized void nAllocationElementData1D(long id, int xoff, int mip, int compIdx, byte[] d, int sizeBytes) { validate(); rsnAllocationElementData1D(mContext, id, xoff, mip, compIdx, d, sizeBytes); } - native void rsnAllocationData2D(int con, - int dstAlloc, int dstXoff, int dstYoff, + native void rsnAllocationData2D(long con, + long dstAlloc, int dstXoff, int dstYoff, int dstMip, int dstFace, int width, int height, - int srcAlloc, int srcXoff, int srcYoff, + long srcAlloc, int srcXoff, int srcYoff, int srcMip, int srcFace); - synchronized void nAllocationData2D(int dstAlloc, int dstXoff, int dstYoff, + synchronized void nAllocationData2D(long dstAlloc, int dstXoff, int dstYoff, int dstMip, int dstFace, int width, int height, - int srcAlloc, int srcXoff, int srcYoff, + long srcAlloc, int srcXoff, int srcYoff, int srcMip, int srcFace) { validate(); rsnAllocationData2D(mContext, @@ -433,42 +432,30 @@ public class RenderScript { srcMip, srcFace); } - native void rsnAllocationData2D(int con, int id, int xoff, int yoff, int mip, int face, int w, int h, byte[] d, int sizeBytes); - synchronized void nAllocationData2D(int id, int xoff, int yoff, int mip, int face, int w, int h, byte[] d, int sizeBytes) { - validate(); - rsnAllocationData2D(mContext, id, xoff, yoff, mip, face, w, h, d, sizeBytes); - } - native void rsnAllocationData2D(int con, int id, int xoff, int yoff, int mip, int face, int w, int h, short[] d, int sizeBytes); - synchronized void nAllocationData2D(int id, int xoff, int yoff, int mip, int face, int w, int h, short[] d, int sizeBytes) { - validate(); - rsnAllocationData2D(mContext, id, xoff, yoff, mip, face, w, h, d, sizeBytes); - } - native void rsnAllocationData2D(int con, int id, int xoff, int yoff, int mip, int face, int w, int h, int[] d, int sizeBytes); - synchronized void nAllocationData2D(int id, int xoff, int yoff, int mip, int face, int w, int h, int[] d, int sizeBytes) { - validate(); - rsnAllocationData2D(mContext, id, xoff, yoff, mip, face, w, h, d, sizeBytes); - } - native void rsnAllocationData2D(int con, int id, int xoff, int yoff, int mip, int face, int w, int h, float[] d, int sizeBytes); - synchronized void nAllocationData2D(int id, int xoff, int yoff, int mip, int face, int w, int h, float[] d, int sizeBytes) { + native void rsnAllocationData2D(long con, long id, int xoff, int yoff, int mip, int face, + int w, int h, Object d, int sizeBytes, int dt); + synchronized void nAllocationData2D(long id, int xoff, int yoff, int mip, int face, + int w, int h, Object d, int sizeBytes, Element.DataType dt) { validate(); - rsnAllocationData2D(mContext, id, xoff, yoff, mip, face, w, h, d, sizeBytes); + rsnAllocationData2D(mContext, id, xoff, yoff, mip, face, w, h, d, sizeBytes, dt.mID); } - native void rsnAllocationData2D(int con, int id, int xoff, int yoff, int mip, int face, Bitmap b); - synchronized void nAllocationData2D(int id, int xoff, int yoff, int mip, int face, Bitmap b) { + + native void rsnAllocationData2D(long con, long id, int xoff, int yoff, int mip, int face, Bitmap b); + synchronized void nAllocationData2D(long id, int xoff, int yoff, int mip, int face, Bitmap b) { validate(); rsnAllocationData2D(mContext, id, xoff, yoff, mip, face, b); } - native void rsnAllocationData3D(int con, - int dstAlloc, int dstXoff, int dstYoff, int dstZoff, + native void rsnAllocationData3D(long con, + long dstAlloc, int dstXoff, int dstYoff, int dstZoff, int dstMip, int width, int height, int depth, - int srcAlloc, int srcXoff, int srcYoff, int srcZoff, + long srcAlloc, int srcXoff, int srcYoff, int srcZoff, int srcMip); - synchronized void nAllocationData3D(int dstAlloc, int dstXoff, int dstYoff, int dstZoff, + synchronized void nAllocationData3D(long dstAlloc, int dstXoff, int dstYoff, int dstZoff, int dstMip, int width, int height, int depth, - int srcAlloc, int srcXoff, int srcYoff, int srcZoff, + long srcAlloc, int srcXoff, int srcYoff, int srcZoff, int srcMip) { validate(); rsnAllocationData3D(mContext, @@ -477,130 +464,118 @@ public class RenderScript { srcAlloc, srcXoff, srcYoff, srcZoff, srcMip); } - native void rsnAllocationData3D(int con, int id, int xoff, int yoff, int zoff, int mip, int w, int h, int depth, byte[] d, int sizeBytes); - synchronized void nAllocationData3D(int id, int xoff, int yoff, int zoff, int mip, int w, int h, int depth, byte[] d, int sizeBytes) { + native void rsnAllocationData3D(long con, long id, int xoff, int yoff, int zoff, int mip, + int w, int h, int depth, Object d, int sizeBytes, int dt); + synchronized void nAllocationData3D(long id, int xoff, int yoff, int zoff, int mip, + int w, int h, int depth, Object d, int sizeBytes, Element.DataType dt) { validate(); - rsnAllocationData3D(mContext, id, xoff, yoff, zoff, mip, w, h, depth, d, sizeBytes); + rsnAllocationData3D(mContext, id, xoff, yoff, zoff, mip, w, h, depth, d, sizeBytes, dt.mID); } - native void rsnAllocationData3D(int con, int id, int xoff, int yoff, int zoff, int mip, int w, int h, int depth, short[] d, int sizeBytes); - synchronized void nAllocationData3D(int id, int xoff, int yoff, int zoff, int mip, int w, int h, int depth, short[] d, int sizeBytes) { - validate(); - rsnAllocationData3D(mContext, id, xoff, yoff, zoff, mip, w, h, depth, d, sizeBytes); - } - native void rsnAllocationData3D(int con, int id, int xoff, int yoff, int zoff, int mip, int w, int h, int depth, int[] d, int sizeBytes); - synchronized void nAllocationData3D(int id, int xoff, int yoff, int zoff, int mip, int w, int h, int depth, int[] d, int sizeBytes) { - validate(); - rsnAllocationData3D(mContext, id, xoff, yoff, zoff, mip, w, h, depth, d, sizeBytes); - } - native void rsnAllocationData3D(int con, int id, int xoff, int yoff, int zoff, int mip, int w, int h, int depth, float[] d, int sizeBytes); - synchronized void nAllocationData3D(int id, int xoff, int yoff, int zoff, int mip, int w, int h, int depth, float[] d, int sizeBytes) { - validate(); - rsnAllocationData3D(mContext, id, xoff, yoff, zoff, mip, w, h, depth, d, sizeBytes); - } - - native void rsnAllocationRead(int con, int id, byte[] d); - synchronized void nAllocationRead(int id, byte[] d) { + native void rsnAllocationRead(long con, long id, Object d, int dt); + synchronized void nAllocationRead(long id, Object d, Element.DataType dt) { validate(); - rsnAllocationRead(mContext, id, d); + rsnAllocationRead(mContext, id, d, dt.mID); } - native void rsnAllocationRead(int con, int id, short[] d); - synchronized void nAllocationRead(int id, short[] d) { - validate(); - rsnAllocationRead(mContext, id, d); - } - native void rsnAllocationRead(int con, int id, int[] d); - synchronized void nAllocationRead(int id, int[] d) { + + native void rsnAllocationRead1D(long con, long id, int off, int mip, int count, Object d, + int sizeBytes, int dt); + synchronized void nAllocationRead1D(long id, int off, int mip, int count, Object d, + int sizeBytes, Element.DataType dt) { validate(); - rsnAllocationRead(mContext, id, d); + rsnAllocationRead1D(mContext, id, off, mip, count, d, sizeBytes, dt.mID); } - native void rsnAllocationRead(int con, int id, float[] d); - synchronized void nAllocationRead(int id, float[] d) { + + native void rsnAllocationRead2D(long con, long id, int xoff, int yoff, int mip, int face, + int w, int h, Object d, int sizeBytes, int dt); + synchronized void nAllocationRead2D(long id, int xoff, int yoff, int mip, int face, + int w, int h, Object d, int sizeBytes, Element.DataType dt) { validate(); - rsnAllocationRead(mContext, id, d); + rsnAllocationRead2D(mContext, id, xoff, yoff, mip, face, w, h, d, sizeBytes, dt.mID); } - native int rsnAllocationGetType(int con, int id); - synchronized int nAllocationGetType(int id) { + + native long rsnAllocationGetType(long con, long id); + synchronized long nAllocationGetType(long id) { validate(); return rsnAllocationGetType(mContext, id); } - native void rsnAllocationResize1D(int con, int id, int dimX); - synchronized void nAllocationResize1D(int id, int dimX) { + native void rsnAllocationResize1D(long con, long id, int dimX); + synchronized void nAllocationResize1D(long id, int dimX) { validate(); rsnAllocationResize1D(mContext, id, dimX); } - native int rsnFileA3DCreateFromAssetStream(int con, int assetStream); - synchronized int nFileA3DCreateFromAssetStream(int assetStream) { + native long rsnFileA3DCreateFromAssetStream(long con, long assetStream); + synchronized long nFileA3DCreateFromAssetStream(long assetStream) { validate(); return rsnFileA3DCreateFromAssetStream(mContext, assetStream); } - native int rsnFileA3DCreateFromFile(int con, String path); - synchronized int nFileA3DCreateFromFile(String path) { + native long rsnFileA3DCreateFromFile(long con, String path); + synchronized long nFileA3DCreateFromFile(String path) { validate(); return rsnFileA3DCreateFromFile(mContext, path); } - native int rsnFileA3DCreateFromAsset(int con, AssetManager mgr, String path); - synchronized int nFileA3DCreateFromAsset(AssetManager mgr, String path) { + native long rsnFileA3DCreateFromAsset(long con, AssetManager mgr, String path); + synchronized long nFileA3DCreateFromAsset(AssetManager mgr, String path) { validate(); return rsnFileA3DCreateFromAsset(mContext, mgr, path); } - native int rsnFileA3DGetNumIndexEntries(int con, int fileA3D); - synchronized int nFileA3DGetNumIndexEntries(int fileA3D) { + native int rsnFileA3DGetNumIndexEntries(long con, long fileA3D); + synchronized int nFileA3DGetNumIndexEntries(long fileA3D) { validate(); return rsnFileA3DGetNumIndexEntries(mContext, fileA3D); } - native void rsnFileA3DGetIndexEntries(int con, int fileA3D, int numEntries, int[] IDs, String[] names); - synchronized void nFileA3DGetIndexEntries(int fileA3D, int numEntries, int[] IDs, String[] names) { + native void rsnFileA3DGetIndexEntries(long con, long fileA3D, int numEntries, int[] IDs, String[] names); + synchronized void nFileA3DGetIndexEntries(long fileA3D, int numEntries, int[] IDs, String[] names) { validate(); rsnFileA3DGetIndexEntries(mContext, fileA3D, numEntries, IDs, names); } - native int rsnFileA3DGetEntryByIndex(int con, int fileA3D, int index); - synchronized int nFileA3DGetEntryByIndex(int fileA3D, int index) { + native long rsnFileA3DGetEntryByIndex(long con, long fileA3D, int index); + synchronized long nFileA3DGetEntryByIndex(long fileA3D, int index) { validate(); return rsnFileA3DGetEntryByIndex(mContext, fileA3D, index); } - native int rsnFontCreateFromFile(int con, String fileName, float size, int dpi); - synchronized int nFontCreateFromFile(String fileName, float size, int dpi) { + native long rsnFontCreateFromFile(long con, String fileName, float size, int dpi); + synchronized long nFontCreateFromFile(String fileName, float size, int dpi) { validate(); return rsnFontCreateFromFile(mContext, fileName, size, dpi); } - native int rsnFontCreateFromAssetStream(int con, String name, float size, int dpi, int assetStream); - synchronized int nFontCreateFromAssetStream(String name, float size, int dpi, int assetStream) { + native long rsnFontCreateFromAssetStream(long con, String name, float size, int dpi, long assetStream); + synchronized long nFontCreateFromAssetStream(String name, float size, int dpi, long assetStream) { validate(); return rsnFontCreateFromAssetStream(mContext, name, size, dpi, assetStream); } - native int rsnFontCreateFromAsset(int con, AssetManager mgr, String path, float size, int dpi); - synchronized int nFontCreateFromAsset(AssetManager mgr, String path, float size, int dpi) { + native long rsnFontCreateFromAsset(long con, AssetManager mgr, String path, float size, int dpi); + synchronized long nFontCreateFromAsset(AssetManager mgr, String path, float size, int dpi) { validate(); return rsnFontCreateFromAsset(mContext, mgr, path, size, dpi); } - native void rsnScriptBindAllocation(int con, int script, int alloc, int slot); - synchronized void nScriptBindAllocation(int script, int alloc, int slot) { + native void rsnScriptBindAllocation(long con, long script, long alloc, int slot); + synchronized void nScriptBindAllocation(long script, long alloc, int slot) { validate(); rsnScriptBindAllocation(mContext, script, alloc, slot); } - native void rsnScriptSetTimeZone(int con, int script, byte[] timeZone); - synchronized void nScriptSetTimeZone(int script, byte[] timeZone) { + native void rsnScriptSetTimeZone(long con, long script, byte[] timeZone); + synchronized void nScriptSetTimeZone(long script, byte[] timeZone) { validate(); rsnScriptSetTimeZone(mContext, script, timeZone); } - native void rsnScriptInvoke(int con, int id, int slot); - synchronized void nScriptInvoke(int id, int slot) { + native void rsnScriptInvoke(long con, long id, int slot); + synchronized void nScriptInvoke(long id, int slot) { validate(); rsnScriptInvoke(mContext, id, slot); } - native void rsnScriptForEach(int con, int id, int slot, int ain, int aout, byte[] params); - native void rsnScriptForEach(int con, int id, int slot, int ain, int aout); - native void rsnScriptForEachClipped(int con, int id, int slot, int ain, int aout, byte[] params, + native void rsnScriptForEach(long con, long id, int slot, long ain, long aout, byte[] params); + native void rsnScriptForEach(long con, long id, int slot, long ain, long aout); + native void rsnScriptForEachClipped(long con, long id, int slot, long ain, long aout, byte[] params, int xstart, int xend, int ystart, int yend, int zstart, int zend); - native void rsnScriptForEachClipped(int con, int id, int slot, int ain, int aout, + native void rsnScriptForEachClipped(long con, long id, int slot, long ain, long aout, int xstart, int xend, int ystart, int yend, int zstart, int zend); - synchronized void nScriptForEach(int id, int slot, int ain, int aout, byte[] params) { + synchronized void nScriptForEach(long id, int slot, long ain, long aout, byte[] params) { validate(); if (params == null) { rsnScriptForEach(mContext, id, slot, ain, aout); @@ -609,7 +584,7 @@ public class RenderScript { } } - synchronized void nScriptForEachClipped(int id, int slot, int ain, int aout, byte[] params, + synchronized void nScriptForEachClipped(long id, int slot, long ain, long aout, byte[] params, int xstart, int xend, int ystart, int yend, int zstart, int zend) { validate(); if (params == null) { @@ -619,138 +594,138 @@ public class RenderScript { } } - native void rsnScriptInvokeV(int con, int id, int slot, byte[] params); - synchronized void nScriptInvokeV(int id, int slot, byte[] params) { + native void rsnScriptInvokeV(long con, long id, int slot, byte[] params); + synchronized void nScriptInvokeV(long id, int slot, byte[] params) { validate(); rsnScriptInvokeV(mContext, id, slot, params); } - native void rsnScriptSetVarI(int con, int id, int slot, int val); - synchronized void nScriptSetVarI(int id, int slot, int val) { + native void rsnScriptSetVarI(long con, long id, int slot, int val); + synchronized void nScriptSetVarI(long id, int slot, int val) { validate(); rsnScriptSetVarI(mContext, id, slot, val); } - native int rsnScriptGetVarI(int con, int id, int slot); - synchronized int nScriptGetVarI(int id, int slot) { + native int rsnScriptGetVarI(long con, long id, int slot); + synchronized int nScriptGetVarI(long id, int slot) { validate(); return rsnScriptGetVarI(mContext, id, slot); } - native void rsnScriptSetVarJ(int con, int id, int slot, long val); - synchronized void nScriptSetVarJ(int id, int slot, long val) { + native void rsnScriptSetVarJ(long con, long id, int slot, long val); + synchronized void nScriptSetVarJ(long id, int slot, long val) { validate(); rsnScriptSetVarJ(mContext, id, slot, val); } - native long rsnScriptGetVarJ(int con, int id, int slot); - synchronized long nScriptGetVarJ(int id, int slot) { + native long rsnScriptGetVarJ(long con, long id, int slot); + synchronized long nScriptGetVarJ(long id, int slot) { validate(); return rsnScriptGetVarJ(mContext, id, slot); } - native void rsnScriptSetVarF(int con, int id, int slot, float val); - synchronized void nScriptSetVarF(int id, int slot, float val) { + native void rsnScriptSetVarF(long con, long id, int slot, float val); + synchronized void nScriptSetVarF(long id, int slot, float val) { validate(); rsnScriptSetVarF(mContext, id, slot, val); } - native float rsnScriptGetVarF(int con, int id, int slot); - synchronized float nScriptGetVarF(int id, int slot) { + native float rsnScriptGetVarF(long con, long id, int slot); + synchronized float nScriptGetVarF(long id, int slot) { validate(); return rsnScriptGetVarF(mContext, id, slot); } - native void rsnScriptSetVarD(int con, int id, int slot, double val); - synchronized void nScriptSetVarD(int id, int slot, double val) { + native void rsnScriptSetVarD(long con, long id, int slot, double val); + synchronized void nScriptSetVarD(long id, int slot, double val) { validate(); rsnScriptSetVarD(mContext, id, slot, val); } - native double rsnScriptGetVarD(int con, int id, int slot); - synchronized double nScriptGetVarD(int id, int slot) { + native double rsnScriptGetVarD(long con, long id, int slot); + synchronized double nScriptGetVarD(long id, int slot) { validate(); return rsnScriptGetVarD(mContext, id, slot); } - native void rsnScriptSetVarV(int con, int id, int slot, byte[] val); - synchronized void nScriptSetVarV(int id, int slot, byte[] val) { + native void rsnScriptSetVarV(long con, long id, int slot, byte[] val); + synchronized void nScriptSetVarV(long id, int slot, byte[] val) { validate(); rsnScriptSetVarV(mContext, id, slot, val); } - native void rsnScriptGetVarV(int con, int id, int slot, byte[] val); - synchronized void nScriptGetVarV(int id, int slot, byte[] val) { + native void rsnScriptGetVarV(long con, long id, int slot, byte[] val); + synchronized void nScriptGetVarV(long id, int slot, byte[] val) { validate(); rsnScriptGetVarV(mContext, id, slot, val); } - native void rsnScriptSetVarVE(int con, int id, int slot, byte[] val, - int e, int[] dims); - synchronized void nScriptSetVarVE(int id, int slot, byte[] val, - int e, int[] dims) { + native void rsnScriptSetVarVE(long con, long id, int slot, byte[] val, + long e, int[] dims); + synchronized void nScriptSetVarVE(long id, int slot, byte[] val, + long e, int[] dims) { validate(); rsnScriptSetVarVE(mContext, id, slot, val, e, dims); } - native void rsnScriptSetVarObj(int con, int id, int slot, int val); - synchronized void nScriptSetVarObj(int id, int slot, int val) { + native void rsnScriptSetVarObj(long con, long id, int slot, long val); + synchronized void nScriptSetVarObj(long id, int slot, long val) { validate(); rsnScriptSetVarObj(mContext, id, slot, val); } - native int rsnScriptCCreate(int con, String resName, String cacheDir, + native long rsnScriptCCreate(long con, String resName, String cacheDir, byte[] script, int length); - synchronized int nScriptCCreate(String resName, String cacheDir, byte[] script, int length) { + synchronized long nScriptCCreate(String resName, String cacheDir, byte[] script, int length) { validate(); return rsnScriptCCreate(mContext, resName, cacheDir, script, length); } - native int rsnScriptIntrinsicCreate(int con, int id, int eid); - synchronized int nScriptIntrinsicCreate(int id, int eid) { + native long rsnScriptIntrinsicCreate(long con, int id, long eid); + synchronized long nScriptIntrinsicCreate(int id, long eid) { validate(); return rsnScriptIntrinsicCreate(mContext, id, eid); } - native int rsnScriptKernelIDCreate(int con, int sid, int slot, int sig); - synchronized int nScriptKernelIDCreate(int sid, int slot, int sig) { + native long rsnScriptKernelIDCreate(long con, long sid, int slot, int sig); + synchronized long nScriptKernelIDCreate(long sid, int slot, int sig) { validate(); return rsnScriptKernelIDCreate(mContext, sid, slot, sig); } - native int rsnScriptFieldIDCreate(int con, int sid, int slot); - synchronized int nScriptFieldIDCreate(int sid, int slot) { + native long rsnScriptFieldIDCreate(long con, long sid, int slot); + synchronized long nScriptFieldIDCreate(long sid, int slot) { validate(); return rsnScriptFieldIDCreate(mContext, sid, slot); } - native int rsnScriptGroupCreate(int con, int[] kernels, int[] src, int[] dstk, int[] dstf, int[] types); - synchronized int nScriptGroupCreate(int[] kernels, int[] src, int[] dstk, int[] dstf, int[] types) { + native long rsnScriptGroupCreate(long con, int[] kernels, int[] src, int[] dstk, int[] dstf, int[] types); + synchronized long nScriptGroupCreate(int[] kernels, int[] src, int[] dstk, int[] dstf, int[] types) { validate(); return rsnScriptGroupCreate(mContext, kernels, src, dstk, dstf, types); } - native void rsnScriptGroupSetInput(int con, int group, int kernel, int alloc); - synchronized void nScriptGroupSetInput(int group, int kernel, int alloc) { + native void rsnScriptGroupSetInput(long con, long group, long kernel, long alloc); + synchronized void nScriptGroupSetInput(long group, long kernel, long alloc) { validate(); rsnScriptGroupSetInput(mContext, group, kernel, alloc); } - native void rsnScriptGroupSetOutput(int con, int group, int kernel, int alloc); - synchronized void nScriptGroupSetOutput(int group, int kernel, int alloc) { + native void rsnScriptGroupSetOutput(long con, long group, long kernel, long alloc); + synchronized void nScriptGroupSetOutput(long group, long kernel, long alloc) { validate(); rsnScriptGroupSetOutput(mContext, group, kernel, alloc); } - native void rsnScriptGroupExecute(int con, int group); - synchronized void nScriptGroupExecute(int group) { + native void rsnScriptGroupExecute(long con, long group); + synchronized void nScriptGroupExecute(long group) { validate(); rsnScriptGroupExecute(mContext, group); } - native int rsnSamplerCreate(int con, int magFilter, int minFilter, + native long rsnSamplerCreate(long con, int magFilter, int minFilter, int wrapS, int wrapT, int wrapR, float aniso); - synchronized int nSamplerCreate(int magFilter, int minFilter, + synchronized long nSamplerCreate(int magFilter, int minFilter, int wrapS, int wrapT, int wrapR, float aniso) { validate(); return rsnSamplerCreate(mContext, magFilter, minFilter, wrapS, wrapT, wrapR, aniso); } - native int rsnProgramStoreCreate(int con, boolean r, boolean g, boolean b, boolean a, + native long rsnProgramStoreCreate(long con, boolean r, boolean g, boolean b, boolean a, boolean depthMask, boolean dither, int srcMode, int dstMode, int depthFunc); - synchronized int nProgramStoreCreate(boolean r, boolean g, boolean b, boolean a, + synchronized long nProgramStoreCreate(boolean r, boolean g, boolean b, boolean a, boolean depthMask, boolean dither, int srcMode, int dstMode, int depthFunc) { validate(); @@ -758,72 +733,72 @@ public class RenderScript { dstMode, depthFunc); } - native int rsnProgramRasterCreate(int con, boolean pointSprite, int cullMode); - synchronized int nProgramRasterCreate(boolean pointSprite, int cullMode) { + native long rsnProgramRasterCreate(long con, boolean pointSprite, int cullMode); + synchronized long nProgramRasterCreate(boolean pointSprite, int cullMode) { validate(); return rsnProgramRasterCreate(mContext, pointSprite, cullMode); } - native void rsnProgramBindConstants(int con, int pv, int slot, int mID); - synchronized void nProgramBindConstants(int pv, int slot, int mID) { + native void rsnProgramBindConstants(long con, long pv, int slot, long mID); + synchronized void nProgramBindConstants(long pv, int slot, long mID) { validate(); rsnProgramBindConstants(mContext, pv, slot, mID); } - native void rsnProgramBindTexture(int con, int vpf, int slot, int a); - synchronized void nProgramBindTexture(int vpf, int slot, int a) { + native void rsnProgramBindTexture(long con, long vpf, int slot, long a); + synchronized void nProgramBindTexture(long vpf, int slot, long a) { validate(); rsnProgramBindTexture(mContext, vpf, slot, a); } - native void rsnProgramBindSampler(int con, int vpf, int slot, int s); - synchronized void nProgramBindSampler(int vpf, int slot, int s) { + native void rsnProgramBindSampler(long con, long vpf, int slot, long s); + synchronized void nProgramBindSampler(long vpf, int slot, long s) { validate(); rsnProgramBindSampler(mContext, vpf, slot, s); } - native int rsnProgramFragmentCreate(int con, String shader, String[] texNames, int[] params); - synchronized int nProgramFragmentCreate(String shader, String[] texNames, int[] params) { + native long rsnProgramFragmentCreate(long con, String shader, String[] texNames, int[] params); + synchronized long nProgramFragmentCreate(String shader, String[] texNames, int[] params) { validate(); return rsnProgramFragmentCreate(mContext, shader, texNames, params); } - native int rsnProgramVertexCreate(int con, String shader, String[] texNames, int[] params); - synchronized int nProgramVertexCreate(String shader, String[] texNames, int[] params) { + native long rsnProgramVertexCreate(long con, String shader, String[] texNames, int[] params); + synchronized long nProgramVertexCreate(String shader, String[] texNames, int[] params) { validate(); return rsnProgramVertexCreate(mContext, shader, texNames, params); } - native int rsnMeshCreate(int con, int[] vtx, int[] idx, int[] prim); - synchronized int nMeshCreate(int[] vtx, int[] idx, int[] prim) { + native long rsnMeshCreate(long con, int[] vtx, int[] idx, int[] prim); + synchronized long nMeshCreate(int[] vtx, int[] idx, int[] prim) { validate(); return rsnMeshCreate(mContext, vtx, idx, prim); } - native int rsnMeshGetVertexBufferCount(int con, int id); - synchronized int nMeshGetVertexBufferCount(int id) { + native int rsnMeshGetVertexBufferCount(long con, long id); + synchronized int nMeshGetVertexBufferCount(long id) { validate(); return rsnMeshGetVertexBufferCount(mContext, id); } - native int rsnMeshGetIndexCount(int con, int id); - synchronized int nMeshGetIndexCount(int id) { + native int rsnMeshGetIndexCount(long con, long id); + synchronized int nMeshGetIndexCount(long id) { validate(); return rsnMeshGetIndexCount(mContext, id); } - native void rsnMeshGetVertices(int con, int id, int[] vtxIds, int vtxIdCount); - synchronized void nMeshGetVertices(int id, int[] vtxIds, int vtxIdCount) { + native void rsnMeshGetVertices(long con, long id, int[] vtxIds, int vtxIdCount); + synchronized void nMeshGetVertices(long id, int[] vtxIds, int vtxIdCount) { validate(); rsnMeshGetVertices(mContext, id, vtxIds, vtxIdCount); } - native void rsnMeshGetIndices(int con, int id, int[] idxIds, int[] primitives, int vtxIdCount); - synchronized void nMeshGetIndices(int id, int[] idxIds, int[] primitives, int vtxIdCount) { + native void rsnMeshGetIndices(long con, long id, int[] idxIds, int[] primitives, int vtxIdCount); + synchronized void nMeshGetIndices(long id, int[] idxIds, int[] primitives, int vtxIdCount) { validate(); rsnMeshGetIndices(mContext, id, idxIds, primitives, vtxIdCount); } - native int rsnPathCreate(int con, int prim, boolean isStatic, int vtx, int loop, float q); - synchronized int nPathCreate(int prim, boolean isStatic, int vtx, int loop, float q) { + native long rsnPathCreate(long con, int prim, boolean isStatic, long vtx, long loop, float q); + synchronized long nPathCreate(int prim, boolean isStatic, long vtx, long loop, float q) { validate(); return rsnPathCreate(mContext, prim, isStatic, vtx, loop, q); } - int mDev; - int mContext; + long mDev; + long mContext; @SuppressWarnings({"FieldCanBeLocal"}) MessageThread mMessageThread; @@ -1136,6 +1111,7 @@ public class RenderScript { if (ctx != null) { mApplicationContext = ctx.getApplicationContext(); } + mRWLock = new ReentrantReadWriteLock(); } /** @@ -1230,6 +1206,8 @@ public class RenderScript { */ public void destroy() { validate(); + nContextFinish(); + nContextDeinitToClient(mContext); mMessageThread.mRun = false; try { @@ -1238,7 +1216,6 @@ public class RenderScript { } nContextDestroy(); - mContext = 0; nDeviceDestroy(mDev); mDev = 0; @@ -1248,7 +1225,7 @@ public class RenderScript { return mContext != 0; } - int safeID(BaseObj o) { + long safeID(BaseObj o) { if(o != null) { return o.getID(this); } diff --git a/graphics/java/android/renderscript/RenderScriptGL.java b/rs/java/android/renderscript/RenderScriptGL.java index bac9c68..c9cbe3e 100644 --- a/graphics/java/android/renderscript/RenderScriptGL.java +++ b/rs/java/android/renderscript/RenderScriptGL.java @@ -286,7 +286,7 @@ public class RenderScriptGL extends RenderScript { */ public void bindRootScript(Script s) { validate(); - nContextBindRootScript(safeID(s)); + nContextBindRootScript((int)safeID(s)); } /** @@ -298,7 +298,7 @@ public class RenderScriptGL extends RenderScript { */ public void bindProgramStore(ProgramStore p) { validate(); - nContextBindProgramStore(safeID(p)); + nContextBindProgramStore((int)safeID(p)); } /** @@ -310,7 +310,7 @@ public class RenderScriptGL extends RenderScript { */ public void bindProgramFragment(ProgramFragment p) { validate(); - nContextBindProgramFragment(safeID(p)); + nContextBindProgramFragment((int)safeID(p)); } /** @@ -322,7 +322,7 @@ public class RenderScriptGL extends RenderScript { */ public void bindProgramRaster(ProgramRaster p) { validate(); - nContextBindProgramRaster(safeID(p)); + nContextBindProgramRaster((int)safeID(p)); } /** @@ -334,7 +334,7 @@ public class RenderScriptGL extends RenderScript { */ public void bindProgramVertex(ProgramVertex p) { validate(); - nContextBindProgramVertex(safeID(p)); + nContextBindProgramVertex((int)safeID(p)); } } diff --git a/graphics/java/android/renderscript/Sampler.java b/rs/java/android/renderscript/Sampler.java index 623055f..8d0e29e 100644 --- a/graphics/java/android/renderscript/Sampler.java +++ b/rs/java/android/renderscript/Sampler.java @@ -60,7 +60,7 @@ public class Sampler extends BaseObj { Value mWrapR; float mAniso; - Sampler(int id, RenderScript rs) { + Sampler(long id, RenderScript rs) { super(id, rs); } @@ -347,7 +347,7 @@ public class Sampler extends BaseObj { public Sampler create() { mRS.validate(); - int id = mRS.nSamplerCreate(mMag.mID, mMin.mID, + long id = mRS.nSamplerCreate(mMag.mID, mMin.mID, mWrapS.mID, mWrapT.mID, mWrapR.mID, mAniso); Sampler sampler = new Sampler(id, mRS); sampler.mMin = mMin; diff --git a/graphics/java/android/renderscript/Script.java b/rs/java/android/renderscript/Script.java index 0026e0e..a1f2287 100644 --- a/graphics/java/android/renderscript/Script.java +++ b/rs/java/android/renderscript/Script.java @@ -36,7 +36,7 @@ public class Script extends BaseObj { Script mScript; int mSlot; int mSig; - KernelID(int id, RenderScript rs, Script s, int slot, int sig) { + KernelID(long id, RenderScript rs, Script s, int slot, int sig) { super(id, rs); mScript = s; mSlot = slot; @@ -54,7 +54,7 @@ public class Script extends BaseObj { return k; } - int id = mRS.nScriptKernelIDCreate(getID(mRS), slot, sig); + long id = mRS.nScriptKernelIDCreate(getID(mRS), slot, sig); if (id == 0) { throw new RSDriverException("Failed to create KernelID"); } @@ -75,7 +75,7 @@ public class Script extends BaseObj { public static final class FieldID extends BaseObj { Script mScript; int mSlot; - FieldID(int id, RenderScript rs, Script s, int slot) { + FieldID(long id, RenderScript rs, Script s, int slot) { super(id, rs); mScript = s; mSlot = slot; @@ -92,7 +92,7 @@ public class Script extends BaseObj { return f; } - int id = mRS.nScriptFieldIDCreate(getID(mRS), slot); + long id = mRS.nScriptFieldIDCreate(getID(mRS), slot); if (id == 0) { throw new RSDriverException("Failed to create FieldID"); } @@ -132,11 +132,11 @@ public class Script extends BaseObj { throw new RSIllegalArgumentException( "At least one of ain or aout is required to be non-null."); } - int in_id = 0; + long in_id = 0; if (ain != null) { in_id = ain.getID(mRS); } - int out_id = 0; + long out_id = 0; if (aout != null) { out_id = aout.getID(mRS); } @@ -161,11 +161,11 @@ public class Script extends BaseObj { forEach(slot, ain, aout, v); return; } - int in_id = 0; + long in_id = 0; if (ain != null) { in_id = ain.getID(mRS); } - int out_id = 0; + long out_id = 0; if (aout != null) { out_id = aout.getID(mRS); } @@ -176,7 +176,7 @@ public class Script extends BaseObj { mRS.nScriptForEachClipped(getID(mRS), slot, in_id, out_id, params, sc.xstart, sc.xend, sc.ystart, sc.yend, sc.zstart, sc.zend); } - Script(int id, RenderScript rs) { + Script(long id, RenderScript rs) { super(id, rs); } @@ -188,6 +188,13 @@ public class Script extends BaseObj { public void bindAllocation(Allocation va, int slot) { mRS.validate(); if (va != null) { + if (mRS.getApplicationContext().getApplicationInfo().targetSdkVersion >= 20) { + final Type t = va.mType; + if (t.hasMipmaps() || t.hasFaces() || (t.getY() != 0) || (t.getZ() != 0)) { + throw new RSIllegalArgumentException( + "API 20+ only allows simple 1D allocations to be used with bind."); + } + } mRS.nScriptBindAllocation(getID(mRS), va.getID(mRS), slot); } else { mRS.nScriptBindAllocation(getID(mRS), 0, slot); diff --git a/graphics/java/android/renderscript/ScriptC.java b/rs/java/android/renderscript/ScriptC.java index b0a5759..cdb2b08 100644 --- a/graphics/java/android/renderscript/ScriptC.java +++ b/rs/java/android/renderscript/ScriptC.java @@ -45,7 +45,17 @@ public class ScriptC extends Script { protected ScriptC(int id, RenderScript rs) { super(id, rs); } - + /** + * Only intended for use by the generated derived classes. + * + * @param id + * @param rs + * + * @hide + */ + protected ScriptC(long id, RenderScript rs) { + super(id, rs); + } /** * Only intended for use by the generated derived classes. * @@ -56,7 +66,7 @@ public class ScriptC extends Script { */ protected ScriptC(RenderScript rs, Resources resources, int resourceID) { super(0, rs); - int id = internalCreate(rs, resources, resourceID); + long id = internalCreate(rs, resources, resourceID); if (id == 0) { throw new RSRuntimeException("Loading of ScriptC script failed."); } @@ -70,7 +80,7 @@ public class ScriptC extends Script { static String mCachePath; - private static synchronized int internalCreate(RenderScript rs, Resources resources, int resourceID) { + private static synchronized long internalCreate(RenderScript rs, Resources resources, int resourceID) { byte[] pgm; int pgmLength; InputStream is = resources.openRawResource(resourceID); diff --git a/graphics/java/android/renderscript/ScriptGroup.java b/rs/java/android/renderscript/ScriptGroup.java index 1416641..48dba30 100644 --- a/graphics/java/android/renderscript/ScriptGroup.java +++ b/rs/java/android/renderscript/ScriptGroup.java @@ -89,7 +89,7 @@ public final class ScriptGroup extends BaseObj { } - ScriptGroup(int id, RenderScript rs) { + ScriptGroup(long id, RenderScript rs) { super(id, rs); } @@ -380,6 +380,7 @@ public final class ScriptGroup extends BaseObj { * @return ScriptGroup The new ScriptGroup */ public ScriptGroup create() { + // FIXME: this is broken for 64-bit if (mNodes.size() == 0) { throw new RSInvalidStateException("Empty script groups are not allowed"); @@ -400,7 +401,7 @@ public final class ScriptGroup extends BaseObj { Node n = mNodes.get(ct); for (int ct2=0; ct2 < n.mKernels.size(); ct2++) { final Script.KernelID kid = n.mKernels.get(ct2); - kernels[idx++] = kid.getID(mRS); + kernels[idx++] = (int)kid.getID(mRS); boolean hasInput = false; boolean hasOutput = false; @@ -434,17 +435,17 @@ public final class ScriptGroup extends BaseObj { for (int ct=0; ct < mLines.size(); ct++) { ConnectLine cl = mLines.get(ct); - src[ct] = cl.mFrom.getID(mRS); + src[ct] = (int)cl.mFrom.getID(mRS); if (cl.mToK != null) { - dstk[ct] = cl.mToK.getID(mRS); + dstk[ct] = (int)cl.mToK.getID(mRS); } if (cl.mToF != null) { - dstf[ct] = cl.mToF.getID(mRS); + dstf[ct] = (int)cl.mToF.getID(mRS); } - types[ct] = cl.mAllocationType.getID(mRS); + types[ct] = (int)cl.mAllocationType.getID(mRS); } - int id = mRS.nScriptGroupCreate(kernels, src, dstk, dstf, types); + long id = mRS.nScriptGroupCreate(kernels, src, dstk, dstf, types); if (id == 0) { throw new RSRuntimeException("Object creation error, should not happen."); } diff --git a/graphics/java/android/renderscript/ScriptIntrinsic.java b/rs/java/android/renderscript/ScriptIntrinsic.java index 096268a..8719e01 100644 --- a/graphics/java/android/renderscript/ScriptIntrinsic.java +++ b/rs/java/android/renderscript/ScriptIntrinsic.java @@ -25,7 +25,7 @@ package android.renderscript; * Not intended for direct use. **/ public abstract class ScriptIntrinsic extends Script { - ScriptIntrinsic(int id, RenderScript rs) { + ScriptIntrinsic(long id, RenderScript rs) { super(id, rs); } } diff --git a/graphics/java/android/renderscript/ScriptIntrinsic3DLUT.java b/rs/java/android/renderscript/ScriptIntrinsic3DLUT.java index 34540a1..96ec875 100644 --- a/graphics/java/android/renderscript/ScriptIntrinsic3DLUT.java +++ b/rs/java/android/renderscript/ScriptIntrinsic3DLUT.java @@ -30,7 +30,7 @@ public final class ScriptIntrinsic3DLUT extends ScriptIntrinsic { private Allocation mLUT; private Element mElement; - private ScriptIntrinsic3DLUT(int id, RenderScript rs, Element e) { + private ScriptIntrinsic3DLUT(long id, RenderScript rs, Element e) { super(id, rs); mElement = e; } @@ -46,7 +46,7 @@ public final class ScriptIntrinsic3DLUT extends ScriptIntrinsic { * @return ScriptIntrinsic3DLUT */ public static ScriptIntrinsic3DLUT create(RenderScript rs, Element e) { - int id = rs.nScriptIntrinsicCreate(8, e.getID(rs)); + long id = rs.nScriptIntrinsicCreate(8, e.getID(rs)); if (!e.isCompatible(Element.U8_4(rs))) { throw new RSIllegalArgumentException("Element must be compatible with uchar4."); diff --git a/graphics/java/android/renderscript/ScriptIntrinsicBlend.java b/rs/java/android/renderscript/ScriptIntrinsicBlend.java index 0e05bc8..40f1a3e 100644 --- a/graphics/java/android/renderscript/ScriptIntrinsicBlend.java +++ b/rs/java/android/renderscript/ScriptIntrinsicBlend.java @@ -21,7 +21,7 @@ package android.renderscript; * Intrinsic kernels for blending two {@link android.renderscript.Allocation} objects. **/ public class ScriptIntrinsicBlend extends ScriptIntrinsic { - ScriptIntrinsicBlend(int id, RenderScript rs) { + ScriptIntrinsicBlend(long id, RenderScript rs) { super(id, rs); } @@ -35,7 +35,7 @@ public class ScriptIntrinsicBlend extends ScriptIntrinsic { */ public static ScriptIntrinsicBlend create(RenderScript rs, Element e) { // 7 comes from RS_SCRIPT_INTRINSIC_ID_BLEND in rsDefines.h - int id = rs.nScriptIntrinsicCreate(7, e.getID(rs)); + long id = rs.nScriptIntrinsicCreate(7, e.getID(rs)); return new ScriptIntrinsicBlend(id, rs); } diff --git a/graphics/java/android/renderscript/ScriptIntrinsicBlur.java b/rs/java/android/renderscript/ScriptIntrinsicBlur.java index aaf5ffc..d1a6fed 100644 --- a/graphics/java/android/renderscript/ScriptIntrinsicBlur.java +++ b/rs/java/android/renderscript/ScriptIntrinsicBlur.java @@ -30,7 +30,7 @@ public final class ScriptIntrinsicBlur extends ScriptIntrinsic { private final float[] mValues = new float[9]; private Allocation mInput; - private ScriptIntrinsicBlur(int id, RenderScript rs) { + private ScriptIntrinsicBlur(long id, RenderScript rs) { super(id, rs); } @@ -49,7 +49,7 @@ public final class ScriptIntrinsicBlur extends ScriptIntrinsic { if ((!e.isCompatible(Element.U8_4(rs))) && (!e.isCompatible(Element.U8(rs)))) { throw new RSIllegalArgumentException("Unsuported element type."); } - int id = rs.nScriptIntrinsicCreate(5, e.getID(rs)); + long id = rs.nScriptIntrinsicCreate(5, e.getID(rs)); ScriptIntrinsicBlur sib = new ScriptIntrinsicBlur(id, rs); sib.setRadius(5.f); return sib; diff --git a/graphics/java/android/renderscript/ScriptIntrinsicColorMatrix.java b/rs/java/android/renderscript/ScriptIntrinsicColorMatrix.java index 32c3d15..601db17 100644 --- a/graphics/java/android/renderscript/ScriptIntrinsicColorMatrix.java +++ b/rs/java/android/renderscript/ScriptIntrinsicColorMatrix.java @@ -43,7 +43,7 @@ public final class ScriptIntrinsicColorMatrix extends ScriptIntrinsic { private final Matrix4f mMatrix = new Matrix4f(); private final Float4 mAdd = new Float4(); - private ScriptIntrinsicColorMatrix(int id, RenderScript rs) { + private ScriptIntrinsicColorMatrix(long id, RenderScript rs) { super(id, rs); } @@ -75,7 +75,7 @@ public final class ScriptIntrinsicColorMatrix extends ScriptIntrinsic { * @return ScriptIntrinsicColorMatrix */ public static ScriptIntrinsicColorMatrix create(RenderScript rs) { - int id = rs.nScriptIntrinsicCreate(2, 0); + long id = rs.nScriptIntrinsicCreate(2, 0); return new ScriptIntrinsicColorMatrix(id, rs); } diff --git a/graphics/java/android/renderscript/ScriptIntrinsicConvolve3x3.java b/rs/java/android/renderscript/ScriptIntrinsicConvolve3x3.java index 5d3c1d3..25f3ee8 100644 --- a/graphics/java/android/renderscript/ScriptIntrinsicConvolve3x3.java +++ b/rs/java/android/renderscript/ScriptIntrinsicConvolve3x3.java @@ -26,7 +26,7 @@ public final class ScriptIntrinsicConvolve3x3 extends ScriptIntrinsic { private final float[] mValues = new float[9]; private Allocation mInput; - private ScriptIntrinsicConvolve3x3(int id, RenderScript rs) { + private ScriptIntrinsicConvolve3x3(long id, RenderScript rs) { super(id, rs); } @@ -61,7 +61,7 @@ public final class ScriptIntrinsicConvolve3x3 extends ScriptIntrinsic { !e.isCompatible(Element.F32_4(rs))) { throw new RSIllegalArgumentException("Unsuported element type."); } - int id = rs.nScriptIntrinsicCreate(1, e.getID(rs)); + long id = rs.nScriptIntrinsicCreate(1, e.getID(rs)); ScriptIntrinsicConvolve3x3 si = new ScriptIntrinsicConvolve3x3(id, rs); si.setCoefficients(f); return si; diff --git a/graphics/java/android/renderscript/ScriptIntrinsicConvolve5x5.java b/rs/java/android/renderscript/ScriptIntrinsicConvolve5x5.java index ad09f95..71ea4cb 100644 --- a/graphics/java/android/renderscript/ScriptIntrinsicConvolve5x5.java +++ b/rs/java/android/renderscript/ScriptIntrinsicConvolve5x5.java @@ -26,7 +26,7 @@ public final class ScriptIntrinsicConvolve5x5 extends ScriptIntrinsic { private final float[] mValues = new float[25]; private Allocation mInput; - private ScriptIntrinsicConvolve5x5(int id, RenderScript rs) { + private ScriptIntrinsicConvolve5x5(long id, RenderScript rs) { super(id, rs); } @@ -62,7 +62,7 @@ public final class ScriptIntrinsicConvolve5x5 extends ScriptIntrinsic { throw new RSIllegalArgumentException("Unsuported element type."); } - int id = rs.nScriptIntrinsicCreate(4, e.getID(rs)); + long id = rs.nScriptIntrinsicCreate(4, e.getID(rs)); return new ScriptIntrinsicConvolve5x5(id, rs); } diff --git a/graphics/java/android/renderscript/ScriptIntrinsicHistogram.java b/rs/java/android/renderscript/ScriptIntrinsicHistogram.java index adc2d95..42e4d04 100644 --- a/graphics/java/android/renderscript/ScriptIntrinsicHistogram.java +++ b/rs/java/android/renderscript/ScriptIntrinsicHistogram.java @@ -28,7 +28,7 @@ import android.util.Log; public final class ScriptIntrinsicHistogram extends ScriptIntrinsic { private Allocation mOut; - private ScriptIntrinsicHistogram(int id, RenderScript rs) { + private ScriptIntrinsicHistogram(long id, RenderScript rs) { super(id, rs); } @@ -52,7 +52,7 @@ public final class ScriptIntrinsicHistogram extends ScriptIntrinsic { (!e.isCompatible(Element.U8(rs)))) { throw new RSIllegalArgumentException("Unsuported element type."); } - int id = rs.nScriptIntrinsicCreate(9, e.getID(rs)); + long id = rs.nScriptIntrinsicCreate(9, e.getID(rs)); ScriptIntrinsicHistogram sib = new ScriptIntrinsicHistogram(id, rs); return sib; } diff --git a/graphics/java/android/renderscript/ScriptIntrinsicLUT.java b/rs/java/android/renderscript/ScriptIntrinsicLUT.java index 0f7ab38..c45c015 100644 --- a/graphics/java/android/renderscript/ScriptIntrinsicLUT.java +++ b/rs/java/android/renderscript/ScriptIntrinsicLUT.java @@ -30,7 +30,7 @@ public final class ScriptIntrinsicLUT extends ScriptIntrinsic { private final byte mCache[] = new byte[1024]; private boolean mDirty = true; - private ScriptIntrinsicLUT(int id, RenderScript rs) { + private ScriptIntrinsicLUT(long id, RenderScript rs) { super(id, rs); mTables = Allocation.createSized(rs, Element.U8(rs), 1024); for (int ct=0; ct < 256; ct++) { @@ -53,7 +53,7 @@ public final class ScriptIntrinsicLUT extends ScriptIntrinsic { * @return ScriptIntrinsicLUT */ public static ScriptIntrinsicLUT create(RenderScript rs, Element e) { - int id = rs.nScriptIntrinsicCreate(3, e.getID(rs)); + long id = rs.nScriptIntrinsicCreate(3, e.getID(rs)); return new ScriptIntrinsicLUT(id, rs); } diff --git a/graphics/java/android/renderscript/ScriptIntrinsicYuvToRGB.java b/rs/java/android/renderscript/ScriptIntrinsicYuvToRGB.java index 845625d..f942982 100644 --- a/graphics/java/android/renderscript/ScriptIntrinsicYuvToRGB.java +++ b/rs/java/android/renderscript/ScriptIntrinsicYuvToRGB.java @@ -27,7 +27,7 @@ package android.renderscript; public final class ScriptIntrinsicYuvToRGB extends ScriptIntrinsic { private Allocation mInput; - ScriptIntrinsicYuvToRGB(int id, RenderScript rs) { + ScriptIntrinsicYuvToRGB(long id, RenderScript rs) { super(id, rs); } @@ -43,7 +43,7 @@ public final class ScriptIntrinsicYuvToRGB extends ScriptIntrinsic { */ public static ScriptIntrinsicYuvToRGB create(RenderScript rs, Element e) { // 6 comes from RS_SCRIPT_INTRINSIC_YUV_TO_RGB in rsDefines.h - int id = rs.nScriptIntrinsicCreate(6, e.getID(rs)); + long id = rs.nScriptIntrinsicCreate(6, e.getID(rs)); ScriptIntrinsicYuvToRGB si = new ScriptIntrinsicYuvToRGB(id, rs); return si; } diff --git a/graphics/java/android/renderscript/Short2.java b/rs/java/android/renderscript/Short2.java index 070d608..070d608 100644 --- a/graphics/java/android/renderscript/Short2.java +++ b/rs/java/android/renderscript/Short2.java diff --git a/graphics/java/android/renderscript/Short3.java b/rs/java/android/renderscript/Short3.java index 661db0a..661db0a 100644 --- a/graphics/java/android/renderscript/Short3.java +++ b/rs/java/android/renderscript/Short3.java diff --git a/graphics/java/android/renderscript/Short4.java b/rs/java/android/renderscript/Short4.java index a2d74f2..a2d74f2 100644 --- a/graphics/java/android/renderscript/Short4.java +++ b/rs/java/android/renderscript/Short4.java diff --git a/graphics/java/android/renderscript/Type.java b/rs/java/android/renderscript/Type.java index e023739..7283814 100644 --- a/graphics/java/android/renderscript/Type.java +++ b/rs/java/android/renderscript/Type.java @@ -190,16 +190,18 @@ public class Type extends BaseObj { } - Type(int id, RenderScript rs) { + Type(long id, RenderScript rs) { super(id, rs); } @Override void updateFromNative() { + // FIXME: rsaTypeGetNativeData needs 32-bit and 64-bit paths + // We have 6 integer to obtain mDimX; mDimY; mDimZ; // mDimLOD; mDimFaces; mElement; int[] dataBuffer = new int[6]; - mRS.nTypeGetNativeData(getID(mRS), dataBuffer); + mRS.nTypeGetNativeData((int)getID(mRS), dataBuffer); mDimX = dataBuffer[0]; mDimY = dataBuffer[1]; @@ -216,6 +218,81 @@ public class Type extends BaseObj { } /** + * Utility function for creating basic 1D types. The type is + * created without mipmaps enabled. + * + * @param rs The RenderScript context + * @param e The Element for the Type + * @param dimX The X dimension, must be > 0 + * + * @return Type + */ + static public Type createX(RenderScript rs, Element e, int dimX) { + if (dimX < 1) { + throw new RSInvalidStateException("Dimension must be >= 1."); + } + + long id = rs.nTypeCreate(e.getID(rs), dimX, 0, 0, false, false, 0); + Type t = new Type(id, rs); + t.mElement = e; + t.mDimX = dimX; + t.calcElementCount(); + return t; + } + + /** + * Utility function for creating basic 2D types. The type is + * created without mipmaps or cubemaps. + * + * @param rs The RenderScript context + * @param e The Element for the Type + * @param dimX The X dimension, must be > 0 + * @param dimY The Y dimension, must be > 0 + * + * @return Type + */ + static public Type createXY(RenderScript rs, Element e, int dimX, int dimY) { + if ((dimX < 1) || (dimY < 1)) { + throw new RSInvalidStateException("Dimension must be >= 1."); + } + + long id = rs.nTypeCreate(e.getID(rs), dimX, dimY, 0, false, false, 0); + Type t = new Type(id, rs); + t.mElement = e; + t.mDimX = dimX; + t.mDimY = dimY; + t.calcElementCount(); + return t; + } + + /** + * Utility function for creating basic 3D types. The type is + * created without mipmaps. + * + * @param rs The RenderScript context + * @param e The Element for the Type + * @param dimX The X dimension, must be > 0 + * @param dimY The Y dimension, must be > 0 + * @param dimZ The Z dimension, must be > 0 + * + * @return Type + */ + static public Type createXYZ(RenderScript rs, Element e, int dimX, int dimY, int dimZ) { + if ((dimX < 1) || (dimY < 1) || (dimZ < 1)) { + throw new RSInvalidStateException("Dimension must be >= 1."); + } + + long id = rs.nTypeCreate(e.getID(rs), dimX, dimY, dimZ, false, false, 0); + Type t = new Type(id, rs); + t.mElement = e; + t.mDimX = dimX; + t.mDimY = dimY; + t.mDimZ = dimZ; + t.calcElementCount(); + return t; + } + + /** * Builder class for Type. * */ @@ -336,7 +413,7 @@ public class Type extends BaseObj { } } - int id = mRS.nTypeCreate(mElement.getID(mRS), + long id = mRS.nTypeCreate(mElement.getID(mRS), mDimX, mDimY, mDimZ, mDimMipmaps, mDimFaces, mYuv); Type t = new Type(id, mRS); t.mElement = mElement; diff --git a/graphics/java/android/renderscript/package.html b/rs/java/android/renderscript/package.html index eb178c1..eb178c1 100644 --- a/graphics/java/android/renderscript/package.html +++ b/rs/java/android/renderscript/package.html diff --git a/graphics/jni/Android.mk b/rs/jni/Android.mk index e8beae5..cbb5b3b 100644 --- a/graphics/jni/Android.mk +++ b/rs/jni/Android.mk @@ -26,7 +26,7 @@ LOCAL_C_INCLUDES += \ $(rs_generated_include_dir) \ $(call include-path-for, corecg graphics) -LOCAL_CFLAGS += +LOCAL_CFLAGS += -Wno-unused-parameter LOCAL_LDLIBS := -lpthread LOCAL_ADDITIONAL_DEPENDENCIES := $(addprefix $(rs_generated_include_dir)/,rsgApiFuncDecl.h) diff --git a/rs/jni/android_renderscript_RenderScript.cpp b/rs/jni/android_renderscript_RenderScript.cpp new file mode 100644 index 0000000..c4e19a1 --- /dev/null +++ b/rs/jni/android_renderscript_RenderScript.cpp @@ -0,0 +1,1659 @@ +/* + * Copyright (C) 2011-2012 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#define LOG_TAG "libRS_jni" + +#include <stdlib.h> +#include <stdio.h> +#include <fcntl.h> +#include <unistd.h> +#include <math.h> +#include <utils/misc.h> + +#include <core/SkBitmap.h> +#include <core/SkPixelRef.h> +#include <core/SkStream.h> +#include <core/SkTemplates.h> + +#include <androidfw/Asset.h> +#include <androidfw/AssetManager.h> +#include <androidfw/ResourceTypes.h> + +#include "jni.h" +#include "JNIHelp.h" +#include "android_runtime/AndroidRuntime.h" +#include "android_runtime/android_view_Surface.h" +#include "android_runtime/android_util_AssetManager.h" + +#include <rs.h> +#include <rsEnv.h> +#include <gui/Surface.h> +#include <gui/GLConsumer.h> +#include <gui/Surface.h> +#include <android_runtime/android_graphics_SurfaceTexture.h> + +//#define LOG_API ALOGE +#define LOG_API(...) + +using namespace android; + +#define PER_ARRAY_TYPE(flag, fnc, ...) { \ + jint len = 0; \ + void *ptr = NULL; \ + size_t typeBytes = 0; \ + switch(dataType) { \ + case RS_TYPE_FLOAT_32: \ + len = _env->GetArrayLength((jfloatArray)data); \ + ptr = _env->GetFloatArrayElements((jfloatArray)data, flag); \ + typeBytes = 4; \ + fnc(__VA_ARGS__); \ + _env->ReleaseFloatArrayElements((jfloatArray)data, (jfloat *)ptr, JNI_ABORT); \ + return; \ + case RS_TYPE_FLOAT_64: \ + len = _env->GetArrayLength((jdoubleArray)data); \ + ptr = _env->GetDoubleArrayElements((jdoubleArray)data, flag); \ + typeBytes = 8; \ + fnc(__VA_ARGS__); \ + _env->ReleaseDoubleArrayElements((jdoubleArray)data, (jdouble *)ptr, JNI_ABORT);\ + return; \ + case RS_TYPE_SIGNED_8: \ + case RS_TYPE_UNSIGNED_8: \ + len = _env->GetArrayLength((jbyteArray)data); \ + ptr = _env->GetByteArrayElements((jbyteArray)data, flag); \ + typeBytes = 1; \ + fnc(__VA_ARGS__); \ + _env->ReleaseByteArrayElements((jbyteArray)data, (jbyte*)ptr, JNI_ABORT); \ + return; \ + case RS_TYPE_SIGNED_16: \ + case RS_TYPE_UNSIGNED_16: \ + len = _env->GetArrayLength((jshortArray)data); \ + ptr = _env->GetShortArrayElements((jshortArray)data, flag); \ + typeBytes = 2; \ + fnc(__VA_ARGS__); \ + _env->ReleaseShortArrayElements((jshortArray)data, (jshort *)ptr, JNI_ABORT); \ + return; \ + case RS_TYPE_SIGNED_32: \ + case RS_TYPE_UNSIGNED_32: \ + len = _env->GetArrayLength((jintArray)data); \ + ptr = _env->GetIntArrayElements((jintArray)data, flag); \ + typeBytes = 4; \ + fnc(__VA_ARGS__); \ + _env->ReleaseIntArrayElements((jintArray)data, (jint *)ptr, JNI_ABORT); \ + return; \ + case RS_TYPE_SIGNED_64: \ + case RS_TYPE_UNSIGNED_64: \ + len = _env->GetArrayLength((jlongArray)data); \ + ptr = _env->GetLongArrayElements((jlongArray)data, flag); \ + typeBytes = 8; \ + fnc(__VA_ARGS__); \ + _env->ReleaseLongArrayElements((jlongArray)data, (jlong *)ptr, JNI_ABORT); \ + return; \ + default: \ + break; \ + } \ +} + + +class AutoJavaStringToUTF8 { +public: + AutoJavaStringToUTF8(JNIEnv* env, jstring str) : fEnv(env), fJStr(str) { + fCStr = env->GetStringUTFChars(str, NULL); + fLength = env->GetStringUTFLength(str); + } + ~AutoJavaStringToUTF8() { + fEnv->ReleaseStringUTFChars(fJStr, fCStr); + } + const char* c_str() const { return fCStr; } + jsize length() const { return fLength; } + +private: + JNIEnv* fEnv; + jstring fJStr; + const char* fCStr; + jsize fLength; +}; + +class AutoJavaStringArrayToUTF8 { +public: + AutoJavaStringArrayToUTF8(JNIEnv* env, jobjectArray strings, jsize stringsLength) + : mEnv(env), mStrings(strings), mStringsLength(stringsLength) { + mCStrings = NULL; + mSizeArray = NULL; + if (stringsLength > 0) { + mCStrings = (const char **)calloc(stringsLength, sizeof(char *)); + mSizeArray = (size_t*)calloc(stringsLength, sizeof(size_t)); + for (jsize ct = 0; ct < stringsLength; ct ++) { + jstring s = (jstring)mEnv->GetObjectArrayElement(mStrings, ct); + mCStrings[ct] = mEnv->GetStringUTFChars(s, NULL); + mSizeArray[ct] = mEnv->GetStringUTFLength(s); + } + } + } + ~AutoJavaStringArrayToUTF8() { + for (jsize ct=0; ct < mStringsLength; ct++) { + jstring s = (jstring)mEnv->GetObjectArrayElement(mStrings, ct); + mEnv->ReleaseStringUTFChars(s, mCStrings[ct]); + } + free(mCStrings); + free(mSizeArray); + } + const char **c_str() const { return mCStrings; } + size_t *c_str_len() const { return mSizeArray; } + jsize length() const { return mStringsLength; } + +private: + JNIEnv *mEnv; + jobjectArray mStrings; + const char **mCStrings; + size_t *mSizeArray; + jsize mStringsLength; +}; + +// --------------------------------------------------------------------------- + +static jfieldID gContextId = 0; +static jfieldID gNativeBitmapID = 0; +static jfieldID gTypeNativeCache = 0; + +static void _nInit(JNIEnv *_env, jclass _this) +{ + gContextId = _env->GetFieldID(_this, "mContext", "J"); + + jclass bitmapClass = _env->FindClass("android/graphics/Bitmap"); + gNativeBitmapID = _env->GetFieldID(bitmapClass, "mNativeBitmap", "J"); +} + +// --------------------------------------------------------------------------- + +static void +nContextFinish(JNIEnv *_env, jobject _this, jlong con) +{ + LOG_API("nContextFinish, con(%p)", (RsContext)con); + rsContextFinish((RsContext)con); +} + +static void +nAssignName(JNIEnv *_env, jobject _this, jlong con, jlong obj, jbyteArray str) +{ + LOG_API("nAssignName, con(%p), obj(%p)", (RsContext)con, (void *)obj); + jint len = _env->GetArrayLength(str); + jbyte * cptr = (jbyte *) _env->GetPrimitiveArrayCritical(str, 0); + rsAssignName((RsContext)con, (void *)obj, (const char *)cptr, len); + _env->ReleasePrimitiveArrayCritical(str, cptr, JNI_ABORT); +} + +static jstring +nGetName(JNIEnv *_env, jobject _this, jlong con, jlong obj) +{ + LOG_API("nGetName, con(%p), obj(%p)", (RsContext)con, (void *)obj); + const char *name = NULL; + rsaGetName((RsContext)con, (void *)obj, &name); + if(name == NULL || strlen(name) == 0) { + return NULL; + } + return _env->NewStringUTF(name); +} + +static void +nObjDestroy(JNIEnv *_env, jobject _this, jlong con, jlong obj) +{ + LOG_API("nObjDestroy, con(%p) obj(%p)", (RsContext)con, (void *)obj); + rsObjDestroy((RsContext)con, (void *)obj); +} + +// --------------------------------------------------------------------------- + +static jlong +nDeviceCreate(JNIEnv *_env, jobject _this) +{ + LOG_API("nDeviceCreate"); + return (jlong)rsDeviceCreate(); +} + +static void +nDeviceDestroy(JNIEnv *_env, jobject _this, jlong dev) +{ + LOG_API("nDeviceDestroy"); + return rsDeviceDestroy((RsDevice)dev); +} + +static void +nDeviceSetConfig(JNIEnv *_env, jobject _this, jlong dev, jint p, jint value) +{ + LOG_API("nDeviceSetConfig dev(%p), param(%i), value(%i)", (void *)dev, p, value); + return rsDeviceSetConfig((RsDevice)dev, (RsDeviceParam)p, value); +} + +static jlong +nContextCreate(JNIEnv *_env, jobject _this, jlong dev, jint ver, jint sdkVer, jint ct) +{ + LOG_API("nContextCreate"); + return (jlong)rsContextCreate((RsDevice)dev, ver, sdkVer, (RsContextType)ct, 0); +} + +static jlong +nContextCreateGL(JNIEnv *_env, jobject _this, jlong dev, jint ver, jint sdkVer, + jint colorMin, jint colorPref, + jint alphaMin, jint alphaPref, + jint depthMin, jint depthPref, + jint stencilMin, jint stencilPref, + jint samplesMin, jint samplesPref, jfloat samplesQ, + jint dpi) +{ + RsSurfaceConfig sc; + sc.alphaMin = alphaMin; + sc.alphaPref = alphaPref; + sc.colorMin = colorMin; + sc.colorPref = colorPref; + sc.depthMin = depthMin; + sc.depthPref = depthPref; + sc.samplesMin = samplesMin; + sc.samplesPref = samplesPref; + sc.samplesQ = samplesQ; + + LOG_API("nContextCreateGL"); + return (jlong)rsContextCreateGL((RsDevice)dev, ver, sdkVer, sc, dpi); +} + +static void +nContextSetPriority(JNIEnv *_env, jobject _this, jlong con, jint p) +{ + LOG_API("ContextSetPriority, con(%p), priority(%i)", (RsContext)con, p); + rsContextSetPriority((RsContext)con, p); +} + + + +static void +nContextSetSurface(JNIEnv *_env, jobject _this, jlong con, jint width, jint height, jobject wnd) +{ + LOG_API("nContextSetSurface, con(%p), width(%i), height(%i), surface(%p)", (RsContext)con, width, height, (Surface *)wnd); + + ANativeWindow * window = NULL; + if (wnd == NULL) { + + } else { + window = android_view_Surface_getNativeWindow(_env, wnd).get(); + } + + rsContextSetSurface((RsContext)con, width, height, window); +} + +static void +nContextDestroy(JNIEnv *_env, jobject _this, jlong con) +{ + LOG_API("nContextDestroy, con(%p)", (RsContext)con); + rsContextDestroy((RsContext)con); +} + +static void +nContextDump(JNIEnv *_env, jobject _this, jlong con, jint bits) +{ + LOG_API("nContextDump, con(%p) bits(%i)", (RsContext)con, bits); + rsContextDump((RsContext)con, bits); +} + +static void +nContextPause(JNIEnv *_env, jobject _this, jlong con) +{ + LOG_API("nContextPause, con(%p)", (RsContext)con); + rsContextPause((RsContext)con); +} + +static void +nContextResume(JNIEnv *_env, jobject _this, jlong con) +{ + LOG_API("nContextResume, con(%p)", (RsContext)con); + rsContextResume((RsContext)con); +} + + +static jstring +nContextGetErrorMessage(JNIEnv *_env, jobject _this, jlong con) +{ + LOG_API("nContextGetErrorMessage, con(%p)", (RsContext)con); + char buf[1024]; + + size_t receiveLen; + uint32_t subID; + int id = rsContextGetMessage((RsContext)con, + buf, sizeof(buf), + &receiveLen, sizeof(receiveLen), + &subID, sizeof(subID)); + if (!id && receiveLen) { + ALOGV("message receive buffer too small. %i", receiveLen); + } + return _env->NewStringUTF(buf); +} + +static jint +nContextGetUserMessage(JNIEnv *_env, jobject _this, jlong con, jintArray data) +{ + jint len = _env->GetArrayLength(data); + LOG_API("nContextGetMessage, con(%p), len(%i)", (RsContext)con, len); + jint *ptr = _env->GetIntArrayElements(data, NULL); + size_t receiveLen; + uint32_t subID; + int id = rsContextGetMessage((RsContext)con, + ptr, len * 4, + &receiveLen, sizeof(receiveLen), + &subID, sizeof(subID)); + if (!id && receiveLen) { + ALOGV("message receive buffer too small. %i", receiveLen); + } + _env->ReleaseIntArrayElements(data, ptr, 0); + return (jint)id; +} + +static jint +nContextPeekMessage(JNIEnv *_env, jobject _this, jlong con, jintArray auxData) +{ + LOG_API("nContextPeekMessage, con(%p)", (RsContext)con); + jint *auxDataPtr = _env->GetIntArrayElements(auxData, NULL); + size_t receiveLen; + uint32_t subID; + int id = rsContextPeekMessage((RsContext)con, &receiveLen, sizeof(receiveLen), + &subID, sizeof(subID)); + auxDataPtr[0] = (jint)subID; + auxDataPtr[1] = (jint)receiveLen; + _env->ReleaseIntArrayElements(auxData, auxDataPtr, 0); + return (jint)id; +} + +static void nContextInitToClient(JNIEnv *_env, jobject _this, jlong con) +{ + LOG_API("nContextInitToClient, con(%p)", (RsContext)con); + rsContextInitToClient((RsContext)con); +} + +static void nContextDeinitToClient(JNIEnv *_env, jobject _this, jlong con) +{ + LOG_API("nContextDeinitToClient, con(%p)", (RsContext)con); + rsContextDeinitToClient((RsContext)con); +} + +static void +nContextSendMessage(JNIEnv *_env, jobject _this, jlong con, jint id, jintArray data) +{ + jint *ptr = NULL; + jint len = 0; + if (data) { + len = _env->GetArrayLength(data); + jint *ptr = _env->GetIntArrayElements(data, NULL); + } + LOG_API("nContextSendMessage, con(%p), id(%i), len(%i)", (RsContext)con, id, len); + rsContextSendMessage((RsContext)con, id, (const uint8_t *)ptr, len * sizeof(int)); + if (data) { + _env->ReleaseIntArrayElements(data, ptr, JNI_ABORT); + } +} + + + +static jlong +nElementCreate(JNIEnv *_env, jobject _this, jlong con, jlong type, jint kind, jboolean norm, jint size) +{ + LOG_API("nElementCreate, con(%p), type(%i), kind(%i), norm(%i), size(%i)", (RsContext)con, type, kind, norm, size); + return (jlong)rsElementCreate((RsContext)con, (RsDataType)type, (RsDataKind)kind, norm, size); +} + +static jlong +nElementCreate2(JNIEnv *_env, jobject _this, jlong con, + jintArray _ids, jobjectArray _names, jintArray _arraySizes) +{ + int fieldCount = _env->GetArrayLength(_ids); + LOG_API("nElementCreate2, con(%p)", (RsContext)con); + + jint *ids = _env->GetIntArrayElements(_ids, NULL); + jint *arraySizes = _env->GetIntArrayElements(_arraySizes, NULL); + + AutoJavaStringArrayToUTF8 names(_env, _names, fieldCount); + + const char **nameArray = names.c_str(); + size_t *sizeArray = names.c_str_len(); + + jlong id = (jlong)rsElementCreate2((RsContext)con, + (RsElement *)ids, fieldCount, + nameArray, fieldCount * sizeof(size_t), sizeArray, + (const uint32_t *)arraySizes, fieldCount); + + _env->ReleaseIntArrayElements(_ids, ids, JNI_ABORT); + _env->ReleaseIntArrayElements(_arraySizes, arraySizes, JNI_ABORT); + return (jlong)id; +} + +static void +nElementGetNativeData(JNIEnv *_env, jobject _this, jlong con, jlong id, jintArray _elementData) +{ + int dataSize = _env->GetArrayLength(_elementData); + LOG_API("nElementGetNativeData, con(%p)", (RsContext)con); + + // we will pack mType; mKind; mNormalized; mVectorSize; NumSubElements + assert(dataSize == 5); + + uint32_t elementData[5]; + rsaElementGetNativeData((RsContext)con, (RsElement)id, elementData, dataSize); + + for(jint i = 0; i < dataSize; i ++) { + _env->SetIntArrayRegion(_elementData, i, 1, (const jint*)&elementData[i]); + } +} + + +static void +nElementGetSubElements(JNIEnv *_env, jobject _this, jlong con, jlong id, + jintArray _IDs, + jobjectArray _names, + jintArray _arraySizes) +{ + int dataSize = _env->GetArrayLength(_IDs); + LOG_API("nElementGetSubElements, con(%p)", (RsContext)con); + + uint32_t *ids = (uint32_t *)malloc((uint32_t)dataSize * sizeof(uint32_t)); + const char **names = (const char **)malloc((uint32_t)dataSize * sizeof(const char *)); + uint32_t *arraySizes = (uint32_t *)malloc((uint32_t)dataSize * sizeof(uint32_t)); + + rsaElementGetSubElements((RsContext)con, (RsElement)id, ids, names, arraySizes, (uint32_t)dataSize); + + for(jint i = 0; i < dataSize; i++) { + _env->SetObjectArrayElement(_names, i, _env->NewStringUTF(names[i])); + _env->SetIntArrayRegion(_IDs, i, 1, (const jint*)&ids[i]); + _env->SetIntArrayRegion(_arraySizes, i, 1, (const jint*)&arraySizes[i]); + } + + free(ids); + free(names); + free(arraySizes); +} + +// ----------------------------------- + +static jlong +nTypeCreate(JNIEnv *_env, jobject _this, jlong con, jlong eid, + jint dimx, jint dimy, jint dimz, jboolean mips, jboolean faces, jint yuv) +{ + LOG_API("nTypeCreate, con(%p) eid(%p), x(%i), y(%i), z(%i), mips(%i), faces(%i), yuv(%i)", + (RsContext)con, eid, dimx, dimy, dimz, mips, faces, yuv); + + return (jlong)rsTypeCreate((RsContext)con, (RsElement)eid, dimx, dimy, dimz, mips, faces, yuv); +} + +static void +nTypeGetNativeData(JNIEnv *_env, jobject _this, jlong con, jlong id, jintArray _typeData) +{ + // We are packing 6 items: mDimX; mDimY; mDimZ; + // mDimLOD; mDimFaces; mElement; into typeData + int elementCount = _env->GetArrayLength(_typeData); + + assert(elementCount == 6); + LOG_API("nTypeGetNativeData, con(%p)", (RsContext)con); + + uint32_t typeData[6]; + rsaTypeGetNativeData((RsContext)con, (RsType)id, typeData, 6); + + for(jint i = 0; i < elementCount; i ++) { + _env->SetIntArrayRegion(_typeData, i, 1, (const jint*)&typeData[i]); + } +} + +// ----------------------------------- + +static jlong +nAllocationCreateTyped(JNIEnv *_env, jobject _this, jlong con, jlong type, jint mips, jint usage, jint pointer) +{ + LOG_API("nAllocationCreateTyped, con(%p), type(%p), mip(%i), usage(%i), ptr(%p)", (RsContext)con, (RsElement)type, mips, usage, (void *)pointer); + return (jlong) rsAllocationCreateTyped((RsContext)con, (RsType)type, (RsAllocationMipmapControl)mips, (uint32_t)usage, (uint32_t)pointer); +} + +static void +nAllocationSyncAll(JNIEnv *_env, jobject _this, jlong con, jlong a, jint bits) +{ + LOG_API("nAllocationSyncAll, con(%p), a(%p), bits(0x%08x)", (RsContext)con, (RsAllocation)a, bits); + rsAllocationSyncAll((RsContext)con, (RsAllocation)a, (RsAllocationUsageType)bits); +} + +static jobject +nAllocationGetSurface(JNIEnv *_env, jobject _this, jlong con, jlong a) +{ + LOG_API("nAllocationGetSurface, con(%p), a(%p)", (RsContext)con, (RsAllocation)a); + + IGraphicBufferProducer *v = (IGraphicBufferProducer *)rsAllocationGetSurface((RsContext)con, (RsAllocation)a); + sp<IGraphicBufferProducer> bp = v; + v->decStrong(NULL); + + jobject o = android_view_Surface_createFromIGraphicBufferProducer(_env, bp); + return o; +} + +static void +nAllocationSetSurface(JNIEnv *_env, jobject _this, jlong con, jlong alloc, jobject sur) +{ + LOG_API("nAllocationSetSurface, con(%p), alloc(%p), surface(%p)", + (RsContext)con, (RsAllocation)alloc, (Surface *)sur); + + sp<Surface> s; + if (sur != 0) { + s = android_view_Surface_getSurface(_env, sur); + } + + rsAllocationSetSurface((RsContext)con, (RsAllocation)alloc, static_cast<ANativeWindow *>(s.get())); +} + +static void +nAllocationIoSend(JNIEnv *_env, jobject _this, jlong con, jlong alloc) +{ + LOG_API("nAllocationIoSend, con(%p), alloc(%p)", (RsContext)con, alloc); + rsAllocationIoSend((RsContext)con, (RsAllocation)alloc); +} + +static void +nAllocationIoReceive(JNIEnv *_env, jobject _this, jlong con, jlong alloc) +{ + LOG_API("nAllocationIoReceive, con(%p), alloc(%p)", (RsContext)con, alloc); + rsAllocationIoReceive((RsContext)con, (RsAllocation)alloc); +} + + +static void +nAllocationGenerateMipmaps(JNIEnv *_env, jobject _this, jlong con, jlong alloc) +{ + LOG_API("nAllocationGenerateMipmaps, con(%p), a(%p)", (RsContext)con, (RsAllocation)alloc); + rsAllocationGenerateMipmaps((RsContext)con, (RsAllocation)alloc); +} + +static jlong +nAllocationCreateFromBitmap(JNIEnv *_env, jobject _this, jlong con, jlong type, jint mip, jobject jbitmap, jint usage) +{ + SkBitmap const * nativeBitmap = + (SkBitmap const *)_env->GetLongField(jbitmap, gNativeBitmapID); + const SkBitmap& bitmap(*nativeBitmap); + + bitmap.lockPixels(); + const void* ptr = bitmap.getPixels(); + jlong id = (jlong)rsAllocationCreateFromBitmap((RsContext)con, + (RsType)type, (RsAllocationMipmapControl)mip, + ptr, bitmap.getSize(), usage); + bitmap.unlockPixels(); + return id; +} + +static jlong +nAllocationCreateBitmapBackedAllocation(JNIEnv *_env, jobject _this, jlong con, jlong type, jint mip, jobject jbitmap, jint usage) +{ + SkBitmap const * nativeBitmap = + (SkBitmap const *)_env->GetLongField(jbitmap, gNativeBitmapID); + const SkBitmap& bitmap(*nativeBitmap); + + bitmap.lockPixels(); + const void* ptr = bitmap.getPixels(); + jlong id = (jlong)rsAllocationCreateTyped((RsContext)con, + (RsType)type, (RsAllocationMipmapControl)mip, + (uint32_t)usage, (size_t)ptr); + bitmap.unlockPixels(); + return id; +} + +static jlong +nAllocationCubeCreateFromBitmap(JNIEnv *_env, jobject _this, jlong con, jlong type, jint mip, jobject jbitmap, jint usage) +{ + SkBitmap const * nativeBitmap = + (SkBitmap const *)_env->GetLongField(jbitmap, gNativeBitmapID); + const SkBitmap& bitmap(*nativeBitmap); + + bitmap.lockPixels(); + const void* ptr = bitmap.getPixels(); + jlong id = (jlong)rsAllocationCubeCreateFromBitmap((RsContext)con, + (RsType)type, (RsAllocationMipmapControl)mip, + ptr, bitmap.getSize(), usage); + bitmap.unlockPixels(); + return id; +} + +static void +nAllocationCopyFromBitmap(JNIEnv *_env, jobject _this, jlong con, jlong alloc, jobject jbitmap) +{ + SkBitmap const * nativeBitmap = + (SkBitmap const *)_env->GetLongField(jbitmap, gNativeBitmapID); + const SkBitmap& bitmap(*nativeBitmap); + int w = bitmap.width(); + int h = bitmap.height(); + + bitmap.lockPixels(); + const void* ptr = bitmap.getPixels(); + rsAllocation2DData((RsContext)con, (RsAllocation)alloc, 0, 0, + 0, RS_ALLOCATION_CUBEMAP_FACE_POSITIVE_X, + w, h, ptr, bitmap.getSize(), 0); + bitmap.unlockPixels(); +} + +static void +nAllocationCopyToBitmap(JNIEnv *_env, jobject _this, jlong con, jlong alloc, jobject jbitmap) +{ + SkBitmap const * nativeBitmap = + (SkBitmap const *)_env->GetLongField(jbitmap, gNativeBitmapID); + const SkBitmap& bitmap(*nativeBitmap); + + bitmap.lockPixels(); + void* ptr = bitmap.getPixels(); + rsAllocationCopyToBitmap((RsContext)con, (RsAllocation)alloc, ptr, bitmap.getSize()); + bitmap.unlockPixels(); + bitmap.notifyPixelsChanged(); +} + +static void ReleaseBitmapCallback(void *bmp) +{ + SkBitmap const * nativeBitmap = (SkBitmap const *)bmp; + nativeBitmap->unlockPixels(); +} + + +static void +nAllocationData1D(JNIEnv *_env, jobject _this, jlong con, jlong _alloc, jint offset, jint lod, + jint count, jobject data, jint sizeBytes, jint dataType) +{ + RsAllocation *alloc = (RsAllocation *)_alloc; + LOG_API("nAllocation1DData, con(%p), adapter(%p), offset(%i), count(%i), sizeBytes(%i), dataType(%i)", + (RsContext)con, (RsAllocation)alloc, offset, count, sizeBytes, dataType); + PER_ARRAY_TYPE(NULL, rsAllocation1DData, (RsContext)con, alloc, offset, lod, count, ptr, sizeBytes); +} + +static void +// native void rsnAllocationElementData1D(long con, long id, int xoff, int compIdx, byte[] d, int sizeBytes); +nAllocationElementData1D(JNIEnv *_env, jobject _this, jlong con, jlong alloc, jint offset, jint lod, jint compIdx, jbyteArray data, jint sizeBytes) +{ + jint len = _env->GetArrayLength(data); + LOG_API("nAllocationElementData1D, con(%p), alloc(%p), offset(%i), comp(%i), len(%i), sizeBytes(%i)", (RsContext)con, (RsAllocation)alloc, offset, compIdx, len, sizeBytes); + jbyte *ptr = _env->GetByteArrayElements(data, NULL); + rsAllocation1DElementData((RsContext)con, (RsAllocation)alloc, offset, lod, ptr, sizeBytes, compIdx); + _env->ReleaseByteArrayElements(data, ptr, JNI_ABORT); +} + +static void +nAllocationData2D(JNIEnv *_env, jobject _this, jlong con, jlong _alloc, jint xoff, jint yoff, jint lod, jint _face, + jint w, jint h, jobject data, jint sizeBytes, jint dataType) +{ + RsAllocation *alloc = (RsAllocation *)_alloc; + RsAllocationCubemapFace face = (RsAllocationCubemapFace)_face; + LOG_API("nAllocation2DData, con(%p), adapter(%p), xoff(%i), yoff(%i), w(%i), h(%i), len(%i) type(%i)", + (RsContext)con, alloc, xoff, yoff, w, h, sizeBytes, dataType); + PER_ARRAY_TYPE(NULL, rsAllocation2DData, (RsContext)con, alloc, xoff, yoff, lod, face, w, h, ptr, sizeBytes, 0); +} + +static void +nAllocationData2D_alloc(JNIEnv *_env, jobject _this, jlong con, + jlong dstAlloc, jint dstXoff, jint dstYoff, + jint dstMip, jint dstFace, + jint width, jint height, + jlong srcAlloc, jint srcXoff, jint srcYoff, + jint srcMip, jint srcFace) +{ + LOG_API("nAllocation2DData_s, con(%p), dstAlloc(%p), dstXoff(%i), dstYoff(%i)," + " dstMip(%i), dstFace(%i), width(%i), height(%i)," + " srcAlloc(%p), srcXoff(%i), srcYoff(%i), srcMip(%i), srcFace(%i)", + (RsContext)con, (RsAllocation)dstAlloc, dstXoff, dstYoff, dstMip, dstFace, + width, height, (RsAllocation)srcAlloc, srcXoff, srcYoff, srcMip, srcFace); + + rsAllocationCopy2DRange((RsContext)con, + (RsAllocation)dstAlloc, + dstXoff, dstYoff, + dstMip, dstFace, + width, height, + (RsAllocation)srcAlloc, + srcXoff, srcYoff, + srcMip, srcFace); +} + +static void +nAllocationData3D(JNIEnv *_env, jobject _this, jlong con, jlong _alloc, jint xoff, jint yoff, jint zoff, jint lod, + jint w, jint h, jint d, jobject data, int sizeBytes, int dataType) +{ + RsAllocation *alloc = (RsAllocation *)_alloc; + LOG_API("nAllocation3DData, con(%p), alloc(%p), xoff(%i), yoff(%i), zoff(%i), lod(%i), w(%i), h(%i), d(%i), sizeBytes(%i)", + (RsContext)con, (RsAllocation)alloc, xoff, yoff, zoff, lod, w, h, d, sizeBytes); + PER_ARRAY_TYPE(NULL, rsAllocation3DData, (RsContext)con, alloc, xoff, yoff, zoff, lod, w, h, d, ptr, sizeBytes, 0); +} + +static void +nAllocationData3D_alloc(JNIEnv *_env, jobject _this, jlong con, + jlong dstAlloc, jint dstXoff, jint dstYoff, jint dstZoff, + jint dstMip, + jint width, jint height, jint depth, + jlong srcAlloc, jint srcXoff, jint srcYoff, jint srcZoff, + jint srcMip) +{ + LOG_API("nAllocationData3D_alloc, con(%p), dstAlloc(%p), dstXoff(%i), dstYoff(%i)," + " dstMip(%i), width(%i), height(%i)," + " srcAlloc(%p), srcXoff(%i), srcYoff(%i), srcMip(%i)", + (RsContext)con, (RsAllocation)dstAlloc, dstXoff, dstYoff, dstMip, + width, height, (RsAllocation)srcAlloc, srcXoff, srcYoff, srcMip); + + rsAllocationCopy3DRange((RsContext)con, + (RsAllocation)dstAlloc, + dstXoff, dstYoff, dstZoff, dstMip, + width, height, depth, + (RsAllocation)srcAlloc, + srcXoff, srcYoff, srcZoff, srcMip); +} + + +static void +nAllocationRead(JNIEnv *_env, jobject _this, jlong con, jlong _alloc, jobject data, int dataType) +{ + RsAllocation *alloc = (RsAllocation *)_alloc; + LOG_API("nAllocationRead, con(%p), alloc(%p)", (RsContext)con, (RsAllocation)alloc); + PER_ARRAY_TYPE(0, rsAllocationRead, (RsContext)con, alloc, ptr, len * typeBytes); +} + +static void +nAllocationRead1D(JNIEnv *_env, jobject _this, jlong con, jlong _alloc, jint offset, jint lod, + jint count, jobject data, int sizeBytes, int dataType) +{ + RsAllocation *alloc = (RsAllocation *)_alloc; + LOG_API("nAllocation1DRead, con(%p), adapter(%p), offset(%i), count(%i), sizeBytes(%i), dataType(%i)", + (RsContext)con, alloc, offset, count, sizeBytes, dataType); + PER_ARRAY_TYPE(0, rsAllocation1DRead, (RsContext)con, alloc, offset, lod, count, ptr, sizeBytes); +} + +static void +nAllocationRead2D(JNIEnv *_env, jobject _this, jlong con, jlong _alloc, jint xoff, jint yoff, jint lod, jint _face, + jint w, jint h, jobject data, int sizeBytes, int dataType) +{ + RsAllocation *alloc = (RsAllocation *)_alloc; + RsAllocationCubemapFace face = (RsAllocationCubemapFace)_face; + LOG_API("nAllocation2DRead, con(%p), adapter(%p), xoff(%i), yoff(%i), w(%i), h(%i), len(%i) type(%i)", + (RsContext)con, alloc, xoff, yoff, w, h, sizeBytes, dataType); + PER_ARRAY_TYPE(0, rsAllocation2DRead, (RsContext)con, alloc, xoff, yoff, lod, face, w, h, ptr, sizeBytes, 0); +} + +static jlong +nAllocationGetType(JNIEnv *_env, jobject _this, jlong con, jlong a) +{ + LOG_API("nAllocationGetType, con(%p), a(%p)", (RsContext)con, (RsAllocation)a); + return (jlong) rsaAllocationGetType((RsContext)con, (RsAllocation)a); +} + +static void +nAllocationResize1D(JNIEnv *_env, jobject _this, jlong con, jlong alloc, jint dimX) +{ + LOG_API("nAllocationResize1D, con(%p), alloc(%p), sizeX(%i)", (RsContext)con, (RsAllocation)alloc, dimX); + rsAllocationResize1D((RsContext)con, (RsAllocation)alloc, dimX); +} + +// ----------------------------------- + +static jlong +nFileA3DCreateFromAssetStream(JNIEnv *_env, jobject _this, jlong con, jlong native_asset) +{ + Asset* asset = reinterpret_cast<Asset*>(native_asset); + ALOGV("______nFileA3D %p", asset); + + jlong id = (jlong)rsaFileA3DCreateFromMemory((RsContext)con, asset->getBuffer(false), asset->getLength()); + return id; +} + +static jlong +nFileA3DCreateFromAsset(JNIEnv *_env, jobject _this, jlong con, jobject _assetMgr, jstring _path) +{ + AssetManager* mgr = assetManagerForJavaObject(_env, _assetMgr); + if (mgr == NULL) { + return 0; + } + + AutoJavaStringToUTF8 str(_env, _path); + Asset* asset = mgr->open(str.c_str(), Asset::ACCESS_BUFFER); + if (asset == NULL) { + return 0; + } + + jlong id = (jlong)rsaFileA3DCreateFromAsset((RsContext)con, asset); + return id; +} + +static jlong +nFileA3DCreateFromFile(JNIEnv *_env, jobject _this, jlong con, jstring fileName) +{ + AutoJavaStringToUTF8 fileNameUTF(_env, fileName); + jlong id = (jlong)rsaFileA3DCreateFromFile((RsContext)con, fileNameUTF.c_str()); + + return id; +} + +static jint +nFileA3DGetNumIndexEntries(JNIEnv *_env, jobject _this, jlong con, jlong fileA3D) +{ + int32_t numEntries = 0; + rsaFileA3DGetNumIndexEntries((RsContext)con, &numEntries, (RsFile)fileA3D); + return (jint)numEntries; +} + +static void +nFileA3DGetIndexEntries(JNIEnv *_env, jobject _this, jlong con, jlong fileA3D, jint numEntries, jintArray _ids, jobjectArray _entries) +{ + ALOGV("______nFileA3D %p", (RsFile) fileA3D); + RsFileIndexEntry *fileEntries = (RsFileIndexEntry*)malloc((uint32_t)numEntries * sizeof(RsFileIndexEntry)); + + rsaFileA3DGetIndexEntries((RsContext)con, fileEntries, (uint32_t)numEntries, (RsFile)fileA3D); + + for(jint i = 0; i < numEntries; i ++) { + _env->SetObjectArrayElement(_entries, i, _env->NewStringUTF(fileEntries[i].objectName)); + _env->SetIntArrayRegion(_ids, i, 1, (const jint*)&fileEntries[i].classID); + } + + free(fileEntries); +} + +static jlong +nFileA3DGetEntryByIndex(JNIEnv *_env, jobject _this, jlong con, jlong fileA3D, jint index) +{ + ALOGV("______nFileA3D %p", (RsFile) fileA3D); + jlong id = (jlong)rsaFileA3DGetEntryByIndex((RsContext)con, (uint32_t)index, (RsFile)fileA3D); + return id; +} + +// ----------------------------------- + +static jlong +nFontCreateFromFile(JNIEnv *_env, jobject _this, jlong con, + jstring fileName, jfloat fontSize, jint dpi) +{ + AutoJavaStringToUTF8 fileNameUTF(_env, fileName); + jlong id = (jlong)rsFontCreateFromFile((RsContext)con, + fileNameUTF.c_str(), fileNameUTF.length(), + fontSize, dpi); + + return id; +} + +static jlong +nFontCreateFromAssetStream(JNIEnv *_env, jobject _this, jlong con, + jstring name, jfloat fontSize, jint dpi, jlong native_asset) +{ + Asset* asset = reinterpret_cast<Asset*>(native_asset); + AutoJavaStringToUTF8 nameUTF(_env, name); + + jlong id = (jlong)rsFontCreateFromMemory((RsContext)con, + nameUTF.c_str(), nameUTF.length(), + fontSize, dpi, + asset->getBuffer(false), asset->getLength()); + return id; +} + +static jlong +nFontCreateFromAsset(JNIEnv *_env, jobject _this, jlong con, jobject _assetMgr, jstring _path, + jfloat fontSize, jint dpi) +{ + AssetManager* mgr = assetManagerForJavaObject(_env, _assetMgr); + if (mgr == NULL) { + return 0; + } + + AutoJavaStringToUTF8 str(_env, _path); + Asset* asset = mgr->open(str.c_str(), Asset::ACCESS_BUFFER); + if (asset == NULL) { + return 0; + } + + jlong id = (jlong)rsFontCreateFromMemory((RsContext)con, + str.c_str(), str.length(), + fontSize, dpi, + asset->getBuffer(false), asset->getLength()); + delete asset; + return id; +} + +// ----------------------------------- + +static void +nScriptBindAllocation(JNIEnv *_env, jobject _this, jlong con, jlong script, jlong alloc, jint slot) +{ + LOG_API("nScriptBindAllocation, con(%p), script(%p), alloc(%p), slot(%i)", (RsContext)con, (RsScript)script, (RsAllocation)alloc, slot); + rsScriptBindAllocation((RsContext)con, (RsScript)script, (RsAllocation)alloc, slot); +} + +static void +nScriptSetVarI(JNIEnv *_env, jobject _this, jlong con, jlong script, jint slot, jint val) +{ + LOG_API("nScriptSetVarI, con(%p), s(%p), slot(%i), val(%i)", (RsContext)con, (void *)script, slot, val); + rsScriptSetVarI((RsContext)con, (RsScript)script, slot, val); +} + +static jint +nScriptGetVarI(JNIEnv *_env, jobject _this, jlong con, jlong script, jint slot) +{ + LOG_API("nScriptGetVarI, con(%p), s(%p), slot(%i)", (RsContext)con, (void *)script, slot); + int value = 0; + rsScriptGetVarV((RsContext)con, (RsScript)script, slot, &value, sizeof(value)); + return value; +} + +static void +nScriptSetVarObj(JNIEnv *_env, jobject _this, jlong con, jlong script, jint slot, jlong val) +{ + LOG_API("nScriptSetVarObj, con(%p), s(%p), slot(%i), val(%i)", (RsContext)con, (void *)script, slot, val); + rsScriptSetVarObj((RsContext)con, (RsScript)script, slot, (RsObjectBase)val); +} + +static void +nScriptSetVarJ(JNIEnv *_env, jobject _this, jlong con, jlong script, jint slot, jlong val) +{ + LOG_API("nScriptSetVarJ, con(%p), s(%p), slot(%i), val(%lli)", (RsContext)con, (void *)script, slot, val); + rsScriptSetVarJ((RsContext)con, (RsScript)script, slot, val); +} + +static jlong +nScriptGetVarJ(JNIEnv *_env, jobject _this, jlong con, jlong script, jint slot) +{ + LOG_API("nScriptGetVarJ, con(%p), s(%p), slot(%i)", (RsContext)con, (void *)script, slot); + jlong value = 0; + rsScriptGetVarV((RsContext)con, (RsScript)script, slot, &value, sizeof(value)); + return value; +} + +static void +nScriptSetVarF(JNIEnv *_env, jobject _this, jlong con, jlong script, jint slot, float val) +{ + LOG_API("nScriptSetVarF, con(%p), s(%p), slot(%i), val(%f)", (RsContext)con, (void *)script, slot, val); + rsScriptSetVarF((RsContext)con, (RsScript)script, slot, val); +} + +static jfloat +nScriptGetVarF(JNIEnv *_env, jobject _this, jlong con, jlong script, jint slot) +{ + LOG_API("nScriptGetVarF, con(%p), s(%p), slot(%i)", (RsContext)con, (void *)script, slot); + jfloat value = 0; + rsScriptGetVarV((RsContext)con, (RsScript)script, slot, &value, sizeof(value)); + return value; +} + +static void +nScriptSetVarD(JNIEnv *_env, jobject _this, jlong con, jlong script, jint slot, double val) +{ + LOG_API("nScriptSetVarD, con(%p), s(%p), slot(%i), val(%lf)", (RsContext)con, (void *)script, slot, val); + rsScriptSetVarD((RsContext)con, (RsScript)script, slot, val); +} + +static jdouble +nScriptGetVarD(JNIEnv *_env, jobject _this, jlong con, jlong script, jint slot) +{ + LOG_API("nScriptGetVarD, con(%p), s(%p), slot(%i)", (RsContext)con, (void *)script, slot); + jdouble value = 0; + rsScriptGetVarV((RsContext)con, (RsScript)script, slot, &value, sizeof(value)); + return value; +} + +static void +nScriptSetVarV(JNIEnv *_env, jobject _this, jlong con, jlong script, jint slot, jbyteArray data) +{ + LOG_API("nScriptSetVarV, con(%p), s(%p), slot(%i)", (RsContext)con, (void *)script, slot); + jint len = _env->GetArrayLength(data); + jbyte *ptr = _env->GetByteArrayElements(data, NULL); + rsScriptSetVarV((RsContext)con, (RsScript)script, slot, ptr, len); + _env->ReleaseByteArrayElements(data, ptr, JNI_ABORT); +} + +static void +nScriptGetVarV(JNIEnv *_env, jobject _this, jlong con, jlong script, jint slot, jbyteArray data) +{ + LOG_API("nScriptSetVarV, con(%p), s(%p), slot(%i)", (RsContext)con, (void *)script, slot); + jint len = _env->GetArrayLength(data); + jbyte *ptr = _env->GetByteArrayElements(data, NULL); + rsScriptGetVarV((RsContext)con, (RsScript)script, slot, ptr, len); + _env->ReleaseByteArrayElements(data, ptr, JNI_ABORT); +} + +static void +nScriptSetVarVE(JNIEnv *_env, jobject _this, jlong con, jlong script, jint slot, jbyteArray data, jlong elem, jintArray dims) +{ + LOG_API("nScriptSetVarVE, con(%p), s(%p), slot(%i)", (RsContext)con, (void *)script, slot); + jint len = _env->GetArrayLength(data); + jbyte *ptr = _env->GetByteArrayElements(data, NULL); + jint dimsLen = _env->GetArrayLength(dims) * sizeof(int); + jint *dimsPtr = _env->GetIntArrayElements(dims, NULL); + rsScriptSetVarVE((RsContext)con, (RsScript)script, slot, ptr, len, (RsElement)elem, + (const size_t*) dimsPtr, dimsLen); + _env->ReleaseByteArrayElements(data, ptr, JNI_ABORT); + _env->ReleaseIntArrayElements(dims, dimsPtr, JNI_ABORT); +} + + +static void +nScriptSetTimeZone(JNIEnv *_env, jobject _this, jlong con, jlong script, jbyteArray timeZone) +{ + LOG_API("nScriptCSetTimeZone, con(%p), s(%p)", (RsContext)con, (void *)script); + + jint length = _env->GetArrayLength(timeZone); + jbyte* timeZone_ptr; + timeZone_ptr = (jbyte *) _env->GetPrimitiveArrayCritical(timeZone, (jboolean *)0); + + rsScriptSetTimeZone((RsContext)con, (RsScript)script, (const char *)timeZone_ptr, length); + + if (timeZone_ptr) { + _env->ReleasePrimitiveArrayCritical(timeZone, timeZone_ptr, 0); + } +} + +static void +nScriptInvoke(JNIEnv *_env, jobject _this, jlong con, jlong obj, jint slot) +{ + LOG_API("nScriptInvoke, con(%p), script(%p)", (RsContext)con, (void *)obj); + rsScriptInvoke((RsContext)con, (RsScript)obj, slot); +} + +static void +nScriptInvokeV(JNIEnv *_env, jobject _this, jlong con, jlong script, jint slot, jbyteArray data) +{ + LOG_API("nScriptInvokeV, con(%p), s(%p), slot(%i)", (RsContext)con, (void *)script, slot); + jint len = _env->GetArrayLength(data); + jbyte *ptr = _env->GetByteArrayElements(data, NULL); + rsScriptInvokeV((RsContext)con, (RsScript)script, slot, ptr, len); + _env->ReleaseByteArrayElements(data, ptr, JNI_ABORT); +} + +static void +nScriptForEach(JNIEnv *_env, jobject _this, jlong con, + jlong script, jint slot, jlong ain, jlong aout) +{ + LOG_API("nScriptForEach, con(%p), s(%p), slot(%i)", (RsContext)con, (void *)script, slot); + rsScriptForEach((RsContext)con, (RsScript)script, slot, (RsAllocation)ain, (RsAllocation)aout, NULL, 0, NULL, 0); +} +static void +nScriptForEachV(JNIEnv *_env, jobject _this, jlong con, + jlong script, jint slot, jlong ain, jlong aout, jbyteArray params) +{ + LOG_API("nScriptForEach, con(%p), s(%p), slot(%i)", (RsContext)con, (void *)script, slot); + jint len = _env->GetArrayLength(params); + jbyte *ptr = _env->GetByteArrayElements(params, NULL); + rsScriptForEach((RsContext)con, (RsScript)script, slot, (RsAllocation)ain, (RsAllocation)aout, ptr, len, NULL, 0); + _env->ReleaseByteArrayElements(params, ptr, JNI_ABORT); +} + +static void +nScriptForEachClipped(JNIEnv *_env, jobject _this, jlong con, + jlong script, jint slot, jlong ain, jlong aout, + jint xstart, jint xend, + jint ystart, jint yend, jint zstart, jint zend) +{ + LOG_API("nScriptForEachClipped, con(%p), s(%p), slot(%i)", (RsContext)con, (void *)script, slot); + RsScriptCall sc; + sc.xStart = xstart; + sc.xEnd = xend; + sc.yStart = ystart; + sc.yEnd = yend; + sc.zStart = zstart; + sc.zEnd = zend; + sc.strategy = RS_FOR_EACH_STRATEGY_DONT_CARE; + sc.arrayStart = 0; + sc.arrayEnd = 0; + rsScriptForEach((RsContext)con, (RsScript)script, slot, (RsAllocation)ain, (RsAllocation)aout, NULL, 0, &sc, sizeof(sc)); +} + +static void +nScriptForEachClippedV(JNIEnv *_env, jobject _this, jlong con, + jlong script, jint slot, jlong ain, jlong aout, + jbyteArray params, jint xstart, jint xend, + jint ystart, jint yend, jint zstart, jint zend) +{ + LOG_API("nScriptForEachClipped, con(%p), s(%p), slot(%i)", (RsContext)con, (void *)script, slot); + jint len = _env->GetArrayLength(params); + jbyte *ptr = _env->GetByteArrayElements(params, NULL); + RsScriptCall sc; + sc.xStart = xstart; + sc.xEnd = xend; + sc.yStart = ystart; + sc.yEnd = yend; + sc.zStart = zstart; + sc.zEnd = zend; + sc.strategy = RS_FOR_EACH_STRATEGY_DONT_CARE; + sc.arrayStart = 0; + sc.arrayEnd = 0; + rsScriptForEach((RsContext)con, (RsScript)script, slot, (RsAllocation)ain, (RsAllocation)aout, ptr, len, &sc, sizeof(sc)); + _env->ReleaseByteArrayElements(params, ptr, JNI_ABORT); +} + +// ----------------------------------- + +static jlong +nScriptCCreate(JNIEnv *_env, jobject _this, jlong con, + jstring resName, jstring cacheDir, + jbyteArray scriptRef, jint length) +{ + LOG_API("nScriptCCreate, con(%p)", (RsContext)con); + + AutoJavaStringToUTF8 resNameUTF(_env, resName); + AutoJavaStringToUTF8 cacheDirUTF(_env, cacheDir); + jlong ret = 0; + jbyte* script_ptr = NULL; + jint _exception = 0; + jint remaining; + if (!scriptRef) { + _exception = 1; + //jniThrowException(_env, "java/lang/IllegalArgumentException", "script == null"); + goto exit; + } + if (length < 0) { + _exception = 1; + //jniThrowException(_env, "java/lang/IllegalArgumentException", "length < 0"); + goto exit; + } + remaining = _env->GetArrayLength(scriptRef); + if (remaining < length) { + _exception = 1; + //jniThrowException(_env, "java/lang/IllegalArgumentException", + // "length > script.length - offset"); + goto exit; + } + script_ptr = (jbyte *) + _env->GetPrimitiveArrayCritical(scriptRef, (jboolean *)0); + + //rsScriptCSetText((RsContext)con, (const char *)script_ptr, length); + + ret = (jlong)rsScriptCCreate((RsContext)con, + resNameUTF.c_str(), resNameUTF.length(), + cacheDirUTF.c_str(), cacheDirUTF.length(), + (const char *)script_ptr, length); + +exit: + if (script_ptr) { + _env->ReleasePrimitiveArrayCritical(scriptRef, script_ptr, + _exception ? JNI_ABORT: 0); + } + + return (jlong)ret; +} + +static jlong +nScriptIntrinsicCreate(JNIEnv *_env, jobject _this, jlong con, jint id, jlong eid) +{ + LOG_API("nScriptIntrinsicCreate, con(%p) id(%i) element(%p)", (RsContext)con, id, (void *)eid); + return (jlong)rsScriptIntrinsicCreate((RsContext)con, id, (RsElement)eid); +} + +static jlong +nScriptKernelIDCreate(JNIEnv *_env, jobject _this, jlong con, jlong sid, jint slot, jint sig) +{ + LOG_API("nScriptKernelIDCreate, con(%p) script(%p), slot(%i), sig(%i)", (RsContext)con, (void *)sid, slot, sig); + return (jlong)rsScriptKernelIDCreate((RsContext)con, (RsScript)sid, slot, sig); +} + +static jlong +nScriptFieldIDCreate(JNIEnv *_env, jobject _this, jlong con, jlong sid, jint slot) +{ + LOG_API("nScriptFieldIDCreate, con(%p) script(%p), slot(%i)", (RsContext)con, (void *)sid, slot); + return (jlong)rsScriptFieldIDCreate((RsContext)con, (RsScript)sid, slot); +} + +static jlong +nScriptGroupCreate(JNIEnv *_env, jobject _this, jlong con, jintArray _kernels, jintArray _src, + jintArray _dstk, jintArray _dstf, jintArray _types) +{ + LOG_API("nScriptGroupCreate, con(%p)", (RsContext)con); + + jint kernelsLen = _env->GetArrayLength(_kernels) * sizeof(int); + jint *kernelsPtr = _env->GetIntArrayElements(_kernels, NULL); + jint srcLen = _env->GetArrayLength(_src) * sizeof(int); + jint *srcPtr = _env->GetIntArrayElements(_src, NULL); + jint dstkLen = _env->GetArrayLength(_dstk) * sizeof(int); + jint *dstkPtr = _env->GetIntArrayElements(_dstk, NULL); + jint dstfLen = _env->GetArrayLength(_dstf) * sizeof(int); + jint *dstfPtr = _env->GetIntArrayElements(_dstf, NULL); + jint typesLen = _env->GetArrayLength(_types) * sizeof(int); + jint *typesPtr = _env->GetIntArrayElements(_types, NULL); + + int id = (int)rsScriptGroupCreate((RsContext)con, + (RsScriptKernelID *)kernelsPtr, kernelsLen, + (RsScriptKernelID *)srcPtr, srcLen, + (RsScriptKernelID *)dstkPtr, dstkLen, + (RsScriptFieldID *)dstfPtr, dstfLen, + (RsType *)typesPtr, typesLen); + + _env->ReleaseIntArrayElements(_kernels, kernelsPtr, 0); + _env->ReleaseIntArrayElements(_src, srcPtr, 0); + _env->ReleaseIntArrayElements(_dstk, dstkPtr, 0); + _env->ReleaseIntArrayElements(_dstf, dstfPtr, 0); + _env->ReleaseIntArrayElements(_types, typesPtr, 0); + return id; +} + +static void +nScriptGroupSetInput(JNIEnv *_env, jobject _this, jlong con, jlong gid, jlong kid, jlong alloc) +{ + LOG_API("nScriptGroupSetInput, con(%p) group(%p), kernelId(%p), alloc(%p)", (RsContext)con, + (void *)gid, (void *)kid, (void *)alloc); + rsScriptGroupSetInput((RsContext)con, (RsScriptGroup)gid, (RsScriptKernelID)kid, (RsAllocation)alloc); +} + +static void +nScriptGroupSetOutput(JNIEnv *_env, jobject _this, jlong con, jlong gid, jlong kid, jlong alloc) +{ + LOG_API("nScriptGroupSetOutput, con(%p) group(%p), kernelId(%p), alloc(%p)", (RsContext)con, + (void *)gid, (void *)kid, (void *)alloc); + rsScriptGroupSetOutput((RsContext)con, (RsScriptGroup)gid, (RsScriptKernelID)kid, (RsAllocation)alloc); +} + +static void +nScriptGroupExecute(JNIEnv *_env, jobject _this, jlong con, jlong gid) +{ + LOG_API("nScriptGroupSetOutput, con(%p) group(%p)", (RsContext)con, (void *)gid); + rsScriptGroupExecute((RsContext)con, (RsScriptGroup)gid); +} + +// --------------------------------------------------------------------------- + +static jlong +nProgramStoreCreate(JNIEnv *_env, jobject _this, jlong con, + jboolean colorMaskR, jboolean colorMaskG, jboolean colorMaskB, jboolean colorMaskA, + jboolean depthMask, jboolean ditherEnable, + jint srcFunc, jint destFunc, + jint depthFunc) +{ + LOG_API("nProgramStoreCreate, con(%p)", (RsContext)con); + return (jlong)rsProgramStoreCreate((RsContext)con, colorMaskR, colorMaskG, colorMaskB, colorMaskA, + depthMask, ditherEnable, (RsBlendSrcFunc)srcFunc, + (RsBlendDstFunc)destFunc, (RsDepthFunc)depthFunc); +} + +// --------------------------------------------------------------------------- + +static void +nProgramBindConstants(JNIEnv *_env, jobject _this, jlong con, jlong vpv, jint slot, jlong a) +{ + LOG_API("nProgramBindConstants, con(%p), vpf(%p), sloat(%i), a(%p)", (RsContext)con, (RsProgramVertex)vpv, slot, (RsAllocation)a); + rsProgramBindConstants((RsContext)con, (RsProgram)vpv, slot, (RsAllocation)a); +} + +static void +nProgramBindTexture(JNIEnv *_env, jobject _this, jlong con, jlong vpf, jint slot, jlong a) +{ + LOG_API("nProgramBindTexture, con(%p), vpf(%p), slot(%i), a(%p)", (RsContext)con, (RsProgramFragment)vpf, slot, (RsAllocation)a); + rsProgramBindTexture((RsContext)con, (RsProgramFragment)vpf, slot, (RsAllocation)a); +} + +static void +nProgramBindSampler(JNIEnv *_env, jobject _this, jlong con, jlong vpf, jint slot, jlong a) +{ + LOG_API("nProgramBindSampler, con(%p), vpf(%p), slot(%i), a(%p)", (RsContext)con, (RsProgramFragment)vpf, slot, (RsSampler)a); + rsProgramBindSampler((RsContext)con, (RsProgramFragment)vpf, slot, (RsSampler)a); +} + +// --------------------------------------------------------------------------- + +static jlong +nProgramFragmentCreate(JNIEnv *_env, jobject _this, jlong con, jstring shader, + jobjectArray texNames, jintArray params) +{ + AutoJavaStringToUTF8 shaderUTF(_env, shader); + jint *paramPtr = _env->GetIntArrayElements(params, NULL); + jint paramLen = _env->GetArrayLength(params); + + int texCount = _env->GetArrayLength(texNames); + AutoJavaStringArrayToUTF8 names(_env, texNames, texCount); + const char ** nameArray = names.c_str(); + size_t* sizeArray = names.c_str_len(); + + LOG_API("nProgramFragmentCreate, con(%p), paramLen(%i)", (RsContext)con, paramLen); + + jlong ret = (jlong)rsProgramFragmentCreate((RsContext)con, shaderUTF.c_str(), shaderUTF.length(), + nameArray, texCount, sizeArray, + (uint32_t *)paramPtr, paramLen); + + _env->ReleaseIntArrayElements(params, paramPtr, JNI_ABORT); + return ret; +} + + +// --------------------------------------------------------------------------- + +static jlong +nProgramVertexCreate(JNIEnv *_env, jobject _this, jlong con, jstring shader, + jobjectArray texNames, jintArray params) +{ + AutoJavaStringToUTF8 shaderUTF(_env, shader); + jint *paramPtr = _env->GetIntArrayElements(params, NULL); + jint paramLen = _env->GetArrayLength(params); + + LOG_API("nProgramVertexCreate, con(%p), paramLen(%i)", (RsContext)con, paramLen); + + int texCount = _env->GetArrayLength(texNames); + AutoJavaStringArrayToUTF8 names(_env, texNames, texCount); + const char ** nameArray = names.c_str(); + size_t* sizeArray = names.c_str_len(); + + jlong ret = (jlong)rsProgramVertexCreate((RsContext)con, shaderUTF.c_str(), shaderUTF.length(), + nameArray, texCount, sizeArray, + (uint32_t *)paramPtr, paramLen); + + _env->ReleaseIntArrayElements(params, paramPtr, JNI_ABORT); + return ret; +} + +// --------------------------------------------------------------------------- + +static jlong +nProgramRasterCreate(JNIEnv *_env, jobject _this, jlong con, jboolean pointSprite, jint cull) +{ + LOG_API("nProgramRasterCreate, con(%p), pointSprite(%i), cull(%i)", (RsContext)con, pointSprite, cull); + return (jlong)rsProgramRasterCreate((RsContext)con, pointSprite, (RsCullMode)cull); +} + + +// --------------------------------------------------------------------------- + +static void +nContextBindRootScript(JNIEnv *_env, jobject _this, jlong con, jint script) +{ + LOG_API("nContextBindRootScript, con(%p), script(%p)", (RsContext)con, (RsScript)script); + rsContextBindRootScript((RsContext)con, (RsScript)script); +} + +static void +nContextBindProgramStore(JNIEnv *_env, jobject _this, jlong con, jint pfs) +{ + LOG_API("nContextBindProgramStore, con(%p), pfs(%p)", (RsContext)con, (RsProgramStore)pfs); + rsContextBindProgramStore((RsContext)con, (RsProgramStore)pfs); +} + +static void +nContextBindProgramFragment(JNIEnv *_env, jobject _this, jlong con, jint pf) +{ + LOG_API("nContextBindProgramFragment, con(%p), pf(%p)", (RsContext)con, (RsProgramFragment)pf); + rsContextBindProgramFragment((RsContext)con, (RsProgramFragment)pf); +} + +static void +nContextBindProgramVertex(JNIEnv *_env, jobject _this, jlong con, jint pf) +{ + LOG_API("nContextBindProgramVertex, con(%p), pf(%p)", (RsContext)con, (RsProgramVertex)pf); + rsContextBindProgramVertex((RsContext)con, (RsProgramVertex)pf); +} + +static void +nContextBindProgramRaster(JNIEnv *_env, jobject _this, jlong con, jint pf) +{ + LOG_API("nContextBindProgramRaster, con(%p), pf(%p)", (RsContext)con, (RsProgramRaster)pf); + rsContextBindProgramRaster((RsContext)con, (RsProgramRaster)pf); +} + + +// --------------------------------------------------------------------------- + +static jlong +nSamplerCreate(JNIEnv *_env, jobject _this, jlong con, jint magFilter, jint minFilter, + jint wrapS, jint wrapT, jint wrapR, jfloat aniso) +{ + LOG_API("nSamplerCreate, con(%p)", (RsContext)con); + return (jlong)rsSamplerCreate((RsContext)con, + (RsSamplerValue)magFilter, + (RsSamplerValue)minFilter, + (RsSamplerValue)wrapS, + (RsSamplerValue)wrapT, + (RsSamplerValue)wrapR, + aniso); +} + +// --------------------------------------------------------------------------- + +static jlong +nPathCreate(JNIEnv *_env, jobject _this, jlong con, jint prim, jboolean isStatic, jlong _vtx, jlong _loop, jfloat q) { + LOG_API("nPathCreate, con(%p)", (RsContext)con); + + jlong id = (jlong)rsPathCreate((RsContext)con, (RsPathPrimitive)prim, isStatic, + (RsAllocation)_vtx, + (RsAllocation)_loop, q); + return id; +} + +static jlong +nMeshCreate(JNIEnv *_env, jobject _this, jlong con, jintArray _vtx, jintArray _idx, jintArray _prim) +{ + LOG_API("nMeshCreate, con(%p)", (RsContext)con); + + jint vtxLen = _env->GetArrayLength(_vtx); + jint *vtxPtr = _env->GetIntArrayElements(_vtx, NULL); + jint idxLen = _env->GetArrayLength(_idx); + jint *idxPtr = _env->GetIntArrayElements(_idx, NULL); + jint primLen = _env->GetArrayLength(_prim); + jint *primPtr = _env->GetIntArrayElements(_prim, NULL); + + int id = (int)rsMeshCreate((RsContext)con, + (RsAllocation *)vtxPtr, vtxLen, + (RsAllocation *)idxPtr, idxLen, + (uint32_t *)primPtr, primLen); + + _env->ReleaseIntArrayElements(_vtx, vtxPtr, 0); + _env->ReleaseIntArrayElements(_idx, idxPtr, 0); + _env->ReleaseIntArrayElements(_prim, primPtr, 0); + return id; +} + +static jint +nMeshGetVertexBufferCount(JNIEnv *_env, jobject _this, jlong con, jlong mesh) +{ + LOG_API("nMeshGetVertexBufferCount, con(%p), Mesh(%p)", (RsContext)con, (RsMesh)mesh); + jint vtxCount = 0; + rsaMeshGetVertexBufferCount((RsContext)con, (RsMesh)mesh, &vtxCount); + return vtxCount; +} + +static jint +nMeshGetIndexCount(JNIEnv *_env, jobject _this, jlong con, jlong mesh) +{ + LOG_API("nMeshGetIndexCount, con(%p), Mesh(%p)", (RsContext)con, (RsMesh)mesh); + jint idxCount = 0; + rsaMeshGetIndexCount((RsContext)con, (RsMesh)mesh, &idxCount); + return idxCount; +} + +static void +nMeshGetVertices(JNIEnv *_env, jobject _this, jlong con, jlong mesh, jintArray _ids, int numVtxIDs) +{ + LOG_API("nMeshGetVertices, con(%p), Mesh(%p)", (RsContext)con, (RsMesh)mesh); + + RsAllocation *allocs = (RsAllocation*)malloc((uint32_t)numVtxIDs * sizeof(RsAllocation)); + rsaMeshGetVertices((RsContext)con, (RsMesh)mesh, allocs, (uint32_t)numVtxIDs); + + for(jint i = 0; i < numVtxIDs; i ++) { + _env->SetIntArrayRegion(_ids, i, 1, (const jint*)&allocs[i]); + } + + free(allocs); +} + +static void +nMeshGetIndices(JNIEnv *_env, jobject _this, jlong con, jlong mesh, jintArray _idxIds, jintArray _primitives, int numIndices) +{ + LOG_API("nMeshGetVertices, con(%p), Mesh(%p)", (RsContext)con, (RsMesh)mesh); + + RsAllocation *allocs = (RsAllocation*)malloc((uint32_t)numIndices * sizeof(RsAllocation)); + uint32_t *prims= (uint32_t*)malloc((uint32_t)numIndices * sizeof(uint32_t)); + + rsaMeshGetIndices((RsContext)con, (RsMesh)mesh, allocs, prims, (uint32_t)numIndices); + + for(jint i = 0; i < numIndices; i ++) { + _env->SetIntArrayRegion(_idxIds, i, 1, (const jint*)&allocs[i]); + _env->SetIntArrayRegion(_primitives, i, 1, (const jint*)&prims[i]); + } + + free(allocs); + free(prims); +} + +// --------------------------------------------------------------------------- + + +static const char *classPathName = "android/renderscript/RenderScript"; + +static JNINativeMethod methods[] = { +{"_nInit", "()V", (void*)_nInit }, + +{"nDeviceCreate", "()J", (void*)nDeviceCreate }, +{"nDeviceDestroy", "(J)V", (void*)nDeviceDestroy }, +{"nDeviceSetConfig", "(JII)V", (void*)nDeviceSetConfig }, +{"nContextGetUserMessage", "(J[I)I", (void*)nContextGetUserMessage }, +{"nContextGetErrorMessage", "(J)Ljava/lang/String;", (void*)nContextGetErrorMessage }, +{"nContextPeekMessage", "(J[I)I", (void*)nContextPeekMessage }, + +{"nContextInitToClient", "(J)V", (void*)nContextInitToClient }, +{"nContextDeinitToClient", "(J)V", (void*)nContextDeinitToClient }, + + +// All methods below are thread protected in java. +{"rsnContextCreate", "(JIII)J", (void*)nContextCreate }, +{"rsnContextCreateGL", "(JIIIIIIIIIIIIFI)J", (void*)nContextCreateGL }, +{"rsnContextFinish", "(J)V", (void*)nContextFinish }, +{"rsnContextSetPriority", "(JI)V", (void*)nContextSetPriority }, +{"rsnContextSetSurface", "(JIILandroid/view/Surface;)V", (void*)nContextSetSurface }, +{"rsnContextDestroy", "(J)V", (void*)nContextDestroy }, +{"rsnContextDump", "(JI)V", (void*)nContextDump }, +{"rsnContextPause", "(J)V", (void*)nContextPause }, +{"rsnContextResume", "(J)V", (void*)nContextResume }, +{"rsnContextSendMessage", "(JI[I)V", (void*)nContextSendMessage }, +{"rsnAssignName", "(JJ[B)V", (void*)nAssignName }, +{"rsnGetName", "(JJ)Ljava/lang/String;", (void*)nGetName }, +{"rsnObjDestroy", "(JJ)V", (void*)nObjDestroy }, + +{"rsnFileA3DCreateFromFile", "(JLjava/lang/String;)J", (void*)nFileA3DCreateFromFile }, +{"rsnFileA3DCreateFromAssetStream", "(JJ)J", (void*)nFileA3DCreateFromAssetStream }, +{"rsnFileA3DCreateFromAsset", "(JLandroid/content/res/AssetManager;Ljava/lang/String;)J", (void*)nFileA3DCreateFromAsset }, +{"rsnFileA3DGetNumIndexEntries", "(JJ)I", (void*)nFileA3DGetNumIndexEntries }, +{"rsnFileA3DGetIndexEntries", "(JJI[I[Ljava/lang/String;)V", (void*)nFileA3DGetIndexEntries }, +{"rsnFileA3DGetEntryByIndex", "(JJI)J", (void*)nFileA3DGetEntryByIndex }, + +{"rsnFontCreateFromFile", "(JLjava/lang/String;FI)J", (void*)nFontCreateFromFile }, +{"rsnFontCreateFromAssetStream", "(JLjava/lang/String;FIJ)J", (void*)nFontCreateFromAssetStream }, +{"rsnFontCreateFromAsset", "(JLandroid/content/res/AssetManager;Ljava/lang/String;FI)J", (void*)nFontCreateFromAsset }, + +{"rsnElementCreate", "(JJIZI)J", (void*)nElementCreate }, +{"rsnElementCreate2", "(J[I[Ljava/lang/String;[I)J", (void*)nElementCreate2 }, +{"rsnElementGetNativeData", "(JJ[I)V", (void*)nElementGetNativeData }, +{"rsnElementGetSubElements", "(JJ[I[Ljava/lang/String;[I)V", (void*)nElementGetSubElements }, + +{"rsnTypeCreate", "(JJIIIZZI)J", (void*)nTypeCreate }, +{"rsnTypeGetNativeData", "(JJ[I)V", (void*)nTypeGetNativeData }, + +{"rsnAllocationCreateTyped", "(JJIII)J", (void*)nAllocationCreateTyped }, +{"rsnAllocationCreateFromBitmap", "(JJILandroid/graphics/Bitmap;I)J", (void*)nAllocationCreateFromBitmap }, +{"rsnAllocationCreateBitmapBackedAllocation", "(JJILandroid/graphics/Bitmap;I)J", (void*)nAllocationCreateBitmapBackedAllocation }, +{"rsnAllocationCubeCreateFromBitmap","(JJILandroid/graphics/Bitmap;I)J", (void*)nAllocationCubeCreateFromBitmap }, + +{"rsnAllocationCopyFromBitmap", "(JJLandroid/graphics/Bitmap;)V", (void*)nAllocationCopyFromBitmap }, +{"rsnAllocationCopyToBitmap", "(JJLandroid/graphics/Bitmap;)V", (void*)nAllocationCopyToBitmap }, + +{"rsnAllocationSyncAll", "(JJI)V", (void*)nAllocationSyncAll }, +{"rsnAllocationGetSurface", "(JJ)Landroid/view/Surface;", (void*)nAllocationGetSurface }, +{"rsnAllocationSetSurface", "(JJLandroid/view/Surface;)V", (void*)nAllocationSetSurface }, +{"rsnAllocationIoSend", "(JJ)V", (void*)nAllocationIoSend }, +{"rsnAllocationIoReceive", "(JJ)V", (void*)nAllocationIoReceive }, +{"rsnAllocationData1D", "(JJIIILjava/lang/Object;II)V", (void*)nAllocationData1D }, +{"rsnAllocationElementData1D", "(JJIII[BI)V", (void*)nAllocationElementData1D }, +{"rsnAllocationData2D", "(JJIIIIIILjava/lang/Object;II)V", (void*)nAllocationData2D }, +{"rsnAllocationData2D", "(JJIIIIIIJIIII)V", (void*)nAllocationData2D_alloc }, +{"rsnAllocationData3D", "(JJIIIIIIILjava/lang/Object;II)V", (void*)nAllocationData3D }, +{"rsnAllocationData3D", "(JJIIIIIIIJIIII)V", (void*)nAllocationData3D_alloc }, +{"rsnAllocationRead", "(JJLjava/lang/Object;I)V", (void*)nAllocationRead }, +{"rsnAllocationRead1D", "(JJIIILjava/lang/Object;II)V", (void*)nAllocationRead1D }, +{"rsnAllocationRead2D", "(JJIIIIIILjava/lang/Object;II)V", (void*)nAllocationRead2D }, +{"rsnAllocationGetType", "(JJ)J", (void*)nAllocationGetType}, +{"rsnAllocationResize1D", "(JJI)V", (void*)nAllocationResize1D }, +{"rsnAllocationGenerateMipmaps", "(JJ)V", (void*)nAllocationGenerateMipmaps }, + +{"rsnScriptBindAllocation", "(JJJI)V", (void*)nScriptBindAllocation }, +{"rsnScriptSetTimeZone", "(JJ[B)V", (void*)nScriptSetTimeZone }, +{"rsnScriptInvoke", "(JJI)V", (void*)nScriptInvoke }, +{"rsnScriptInvokeV", "(JJI[B)V", (void*)nScriptInvokeV }, +{"rsnScriptForEach", "(JJIJJ)V", (void*)nScriptForEach }, +{"rsnScriptForEach", "(JJIJJ[B)V", (void*)nScriptForEachV }, +{"rsnScriptForEachClipped", "(JJIJJIIIIII)V", (void*)nScriptForEachClipped }, +{"rsnScriptForEachClipped", "(JJIJJ[BIIIIII)V", (void*)nScriptForEachClippedV }, +{"rsnScriptSetVarI", "(JJII)V", (void*)nScriptSetVarI }, +{"rsnScriptGetVarI", "(JJI)I", (void*)nScriptGetVarI }, +{"rsnScriptSetVarJ", "(JJIJ)V", (void*)nScriptSetVarJ }, +{"rsnScriptGetVarJ", "(JJI)J", (void*)nScriptGetVarJ }, +{"rsnScriptSetVarF", "(JJIF)V", (void*)nScriptSetVarF }, +{"rsnScriptGetVarF", "(JJI)F", (void*)nScriptGetVarF }, +{"rsnScriptSetVarD", "(JJID)V", (void*)nScriptSetVarD }, +{"rsnScriptGetVarD", "(JJI)D", (void*)nScriptGetVarD }, +{"rsnScriptSetVarV", "(JJI[B)V", (void*)nScriptSetVarV }, +{"rsnScriptGetVarV", "(JJI[B)V", (void*)nScriptGetVarV }, +{"rsnScriptSetVarVE", "(JJI[BJ[I)V", (void*)nScriptSetVarVE }, +{"rsnScriptSetVarObj", "(JJIJ)V", (void*)nScriptSetVarObj }, + +{"rsnScriptCCreate", "(JLjava/lang/String;Ljava/lang/String;[BI)J", (void*)nScriptCCreate }, +{"rsnScriptIntrinsicCreate", "(JIJ)J", (void*)nScriptIntrinsicCreate }, +{"rsnScriptKernelIDCreate", "(JJII)J", (void*)nScriptKernelIDCreate }, +{"rsnScriptFieldIDCreate", "(JJI)J", (void*)nScriptFieldIDCreate }, +{"rsnScriptGroupCreate", "(J[I[I[I[I[I)J", (void*)nScriptGroupCreate }, +{"rsnScriptGroupSetInput", "(JJJJ)V", (void*)nScriptGroupSetInput }, +{"rsnScriptGroupSetOutput", "(JJJJ)V", (void*)nScriptGroupSetOutput }, +{"rsnScriptGroupExecute", "(JJ)V", (void*)nScriptGroupExecute }, + +{"rsnProgramStoreCreate", "(JZZZZZZIII)J", (void*)nProgramStoreCreate }, + +{"rsnProgramBindConstants", "(JJIJ)V", (void*)nProgramBindConstants }, +{"rsnProgramBindTexture", "(JJIJ)V", (void*)nProgramBindTexture }, +{"rsnProgramBindSampler", "(JJIJ)V", (void*)nProgramBindSampler }, + +{"rsnProgramFragmentCreate", "(JLjava/lang/String;[Ljava/lang/String;[I)J", (void*)nProgramFragmentCreate }, +{"rsnProgramRasterCreate", "(JZI)J", (void*)nProgramRasterCreate }, +{"rsnProgramVertexCreate", "(JLjava/lang/String;[Ljava/lang/String;[I)J", (void*)nProgramVertexCreate }, + +{"rsnContextBindRootScript", "(JI)V", (void*)nContextBindRootScript }, +{"rsnContextBindProgramStore", "(JI)V", (void*)nContextBindProgramStore }, +{"rsnContextBindProgramFragment", "(JI)V", (void*)nContextBindProgramFragment }, +{"rsnContextBindProgramVertex", "(JI)V", (void*)nContextBindProgramVertex }, +{"rsnContextBindProgramRaster", "(JI)V", (void*)nContextBindProgramRaster }, + +{"rsnSamplerCreate", "(JIIIIIF)J", (void*)nSamplerCreate }, + +{"rsnPathCreate", "(JIZJJF)J", (void*)nPathCreate }, +{"rsnMeshCreate", "(J[I[I[I)J", (void*)nMeshCreate }, + +{"rsnMeshGetVertexBufferCount", "(JJ)I", (void*)nMeshGetVertexBufferCount }, +{"rsnMeshGetIndexCount", "(JJ)I", (void*)nMeshGetIndexCount }, +{"rsnMeshGetVertices", "(JJ[II)V", (void*)nMeshGetVertices }, +{"rsnMeshGetIndices", "(JJ[I[II)V", (void*)nMeshGetIndices }, + +}; + +static int registerFuncs(JNIEnv *_env) +{ + return android::AndroidRuntime::registerNativeMethods( + _env, classPathName, methods, NELEM(methods)); +} + +// --------------------------------------------------------------------------- + +jint JNI_OnLoad(JavaVM* vm, void* reserved) +{ + JNIEnv* env = NULL; + jint result = -1; + + if (vm->GetEnv((void**) &env, JNI_VERSION_1_4) != JNI_OK) { + ALOGE("ERROR: GetEnv failed\n"); + goto bail; + } + assert(env != NULL); + + if (registerFuncs(env) < 0) { + ALOGE("ERROR: Renderscript native registration failed\n"); + goto bail; + } + + /* success -- return valid version number */ + result = JNI_VERSION_1_4; + +bail: + return result; +} diff --git a/services/core/java/com/android/server/ConsumerIrService.java b/services/core/java/com/android/server/ConsumerIrService.java index 783dff1..583f1bc 100644 --- a/services/core/java/com/android/server/ConsumerIrService.java +++ b/services/core/java/com/android/server/ConsumerIrService.java @@ -49,13 +49,13 @@ public class ConsumerIrService extends IConsumerIrService.Stub { private static final int MAX_XMIT_TIME = 2000000; /* in microseconds */ - private static native int halOpen(); - private static native int halTransmit(int halObject, int carrierFrequency, int[] pattern); - private static native int[] halGetCarrierFrequencies(int halObject); + private static native long halOpen(); + private static native int halTransmit(long halObject, int carrierFrequency, int[] pattern); + private static native int[] halGetCarrierFrequencies(long halObject); private final Context mContext; private final PowerManager.WakeLock mWakeLock; - private final int mHal; + private final long mNativeHal; private final Object mHalLock = new Object(); ConsumerIrService(Context context) { @@ -65,23 +65,23 @@ public class ConsumerIrService extends IConsumerIrService.Stub { mWakeLock = pm.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, TAG); mWakeLock.setReferenceCounted(true); - mHal = halOpen(); + mNativeHal = halOpen(); if (mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_CONSUMER_IR)) { - if (mHal == 0) { + if (mNativeHal == 0) { throw new RuntimeException("FEATURE_CONSUMER_IR present, but no IR HAL loaded!"); } - } else if (mHal != 0) { + } else if (mNativeHal != 0) { throw new RuntimeException("IR HAL present, but FEATURE_CONSUMER_IR is not set!"); } } @Override public boolean hasIrEmitter() { - return mHal != 0; + return mNativeHal != 0; } private void throwIfNoIrEmitter() { - if (mHal == 0) { + if (mNativeHal == 0) { throw new UnsupportedOperationException("IR emitter not available"); } } @@ -111,7 +111,7 @@ public class ConsumerIrService extends IConsumerIrService.Stub { // Right now there is no mechanism to ensure fair queing of IR requests synchronized (mHalLock) { - int err = halTransmit(mHal, carrierFrequency, pattern); + int err = halTransmit(mNativeHal, carrierFrequency, pattern); if (err < 0) { Slog.e(TAG, "Error transmitting: " + err); @@ -129,7 +129,7 @@ public class ConsumerIrService extends IConsumerIrService.Stub { throwIfNoIrEmitter(); synchronized(mHalLock) { - return halGetCarrierFrequencies(mHal); + return halGetCarrierFrequencies(mNativeHal); } } } diff --git a/services/core/java/com/android/server/lights/LightsService.java b/services/core/java/com/android/server/lights/LightsService.java index 62c0ec9..94cf668 100644 --- a/services/core/java/com/android/server/lights/LightsService.java +++ b/services/core/java/com/android/server/lights/LightsService.java @@ -78,6 +78,7 @@ public class LightsService extends SystemService { synchronized (this) { if (mColor == 0 && !mFlashing) { setLightLocked(color, LIGHT_FLASH_HARDWARE, onMS, 1000, BRIGHTNESS_MODE_USER); + mColor = 0; mH.sendMessageDelayed(Message.obtain(mH, 1, this), onMS); } } diff --git a/services/core/java/com/android/server/pm/Installer.java b/services/core/java/com/android/server/pm/Installer.java index 6185e50..ad6eabd 100644 --- a/services/core/java/com/android/server/pm/Installer.java +++ b/services/core/java/com/android/server/pm/Installer.java @@ -221,6 +221,17 @@ public final class Installer extends SystemService { return execute(builder.toString()); } + public int idmap(String targetApkPath, String overlayApkPath, int uid) { + StringBuilder builder = new StringBuilder("idmap"); + builder.append(' '); + builder.append(targetApkPath); + builder.append(' '); + builder.append(overlayApkPath); + builder.append(' '); + builder.append(uid); + return execute(builder.toString()); + } + public int movedex(String srcPath, String dstPath) { StringBuilder builder = new StringBuilder("movedex"); builder.append(' '); diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java index df83fd7..0be8a4f 100755 --- a/services/core/java/com/android/server/pm/PackageManagerService.java +++ b/services/core/java/com/android/server/pm/PackageManagerService.java @@ -219,6 +219,7 @@ public class PackageManagerService extends IPackageManager.Stub { static final int SCAN_UPDATE_TIME = 1<<6; static final int SCAN_DEFER_DEX = 1<<7; static final int SCAN_BOOTING = 1<<8; + static final int SCAN_TRUSTED_OVERLAY = 1<<9; static final int REMOVE_CHATTY = 1<<16; @@ -259,9 +260,15 @@ public class PackageManagerService extends IPackageManager.Stub { private static final String LIB_DIR_NAME = "lib"; + private static final String VENDOR_OVERLAY_DIR = "/vendor/overlay"; + static final String mTempContainerPrefix = "smdl2tmp"; final ServiceThread mHandlerThread; + + private static final String IDMAP_PREFIX = "/data/resource-cache/"; + private static final String IDMAP_SUFFIX = "@idmap"; + final PackageHandler mHandler; final int mSdkVersion = Build.VERSION.SDK_INT; @@ -297,6 +304,9 @@ public class PackageManagerService extends IPackageManager.Stub { // This is the object monitoring the system app dir. final FileObserver mVendorInstallObserver; + // This is the object monitoring the vendor overlay package dir. + final FileObserver mVendorOverlayInstallObserver; + // This is the object monitoring mAppInstallDir. final FileObserver mAppInstallObserver; @@ -344,6 +354,10 @@ public class PackageManagerService extends IPackageManager.Stub { final HashMap<String, PackageParser.Package> mPackages = new HashMap<String, PackageParser.Package>(); + // Tracks available target package names -> overlay package paths. + final HashMap<String, HashMap<String, PackageParser.Package>> mOverlays = + new HashMap<String, HashMap<String, PackageParser.Package>>(); + final Settings mSettings; boolean mRestoredSettings; @@ -1279,6 +1293,17 @@ public class PackageManagerService extends IPackageManager.Stub { } } + // Collect vendor overlay packages. + // (Do this before scanning any apps.) + // For security and version matching reason, only consider + // overlay packages if they reside in VENDOR_OVERLAY_DIR. + File vendorOverlayDir = new File(VENDOR_OVERLAY_DIR); + mVendorOverlayInstallObserver = new AppDirObserver( + vendorOverlayDir.getPath(), OBSERVER_EVENTS, true, false); + mVendorOverlayInstallObserver.startWatching(); + scanDirLI(vendorOverlayDir, PackageParser.PARSE_IS_SYSTEM + | PackageParser.PARSE_IS_SYSTEM_DIR, scanMode | SCAN_TRUSTED_OVERLAY, 0); + // Find base frameworks (resource packages without code). mFrameworkInstallObserver = new AppDirObserver( frameworkDir.getPath(), OBSERVER_EVENTS, true, false); @@ -1307,6 +1332,11 @@ public class PackageManagerService extends IPackageManager.Stub { // Collect all vendor packages. File vendorAppDir = new File("/vendor/app"); + try { + vendorAppDir = vendorAppDir.getCanonicalFile(); + } catch (IOException e) { + // failed to look up canonical path, continue with original one + } mVendorInstallObserver = new AppDirObserver( vendorAppDir.getPath(), OBSERVER_EVENTS, true, false); mVendorInstallObserver.startWatching(); @@ -3476,6 +3506,56 @@ public class PackageManagerService extends IPackageManager.Stub { return finalList; } + private void createIdmapsForPackageLI(PackageParser.Package pkg) { + HashMap<String, PackageParser.Package> overlays = mOverlays.get(pkg.packageName); + if (overlays == null) { + Slog.w(TAG, "Unable to create idmap for " + pkg.packageName + ": no overlay packages"); + return; + } + for (PackageParser.Package opkg : overlays.values()) { + // Not much to do if idmap fails: we already logged the error + // and we certainly don't want to abort installation of pkg simply + // because an overlay didn't fit properly. For these reasons, + // ignore the return value of createIdmapForPackagePairLI. + createIdmapForPackagePairLI(pkg, opkg); + } + } + + private boolean createIdmapForPackagePairLI(PackageParser.Package pkg, + PackageParser.Package opkg) { + if (!opkg.mTrustedOverlay) { + Slog.w(TAG, "Skipping target and overlay pair " + pkg.mScanPath + " and " + + opkg.mScanPath + ": overlay not trusted"); + return false; + } + HashMap<String, PackageParser.Package> overlaySet = mOverlays.get(pkg.packageName); + if (overlaySet == null) { + Slog.e(TAG, "was about to create idmap for " + pkg.mScanPath + " and " + + opkg.mScanPath + " but target package has no known overlays"); + return false; + } + final int sharedGid = UserHandle.getSharedAppGid(pkg.applicationInfo.uid); + if (mInstaller.idmap(pkg.mScanPath, opkg.mScanPath, sharedGid) != 0) { + Slog.e(TAG, "Failed to generate idmap for " + pkg.mScanPath + " and " + opkg.mScanPath); + return false; + } + PackageParser.Package[] overlayArray = + overlaySet.values().toArray(new PackageParser.Package[0]); + Comparator<PackageParser.Package> cmp = new Comparator<PackageParser.Package>() { + public int compare(PackageParser.Package p1, PackageParser.Package p2) { + return p1.mOverlayPriority - p2.mOverlayPriority; + } + }; + Arrays.sort(overlayArray, cmp); + + pkg.applicationInfo.resourceDirs = new String[overlayArray.length]; + int i = 0; + for (PackageParser.Package p : overlayArray) { + pkg.applicationInfo.resourceDirs[i++] = p.applicationInfo.sourceDir; + } + return true; + } + private void scanDirLI(File dir, int flags, int scanMode, long currentTime) { String[] files = dir.list(); if (files == null) { @@ -3573,7 +3653,7 @@ public class PackageManagerService extends IPackageManager.Stub { pp.setSeparateProcesses(mSeparateProcesses); pp.setOnlyCoreApps(mOnlyCore); final PackageParser.Package pkg = pp.parsePackage(scanFile, - scanPath, mMetrics, parseFlags); + scanPath, mMetrics, parseFlags, (scanMode & SCAN_TRUSTED_OVERLAY) != 0); if (pkg == null) { mLastScanError = pp.getParseError(); @@ -5082,6 +5162,29 @@ public class PackageManagerService extends IPackageManager.Stub { } pkgSetting.setTimeStamp(scanFileTime); + + // Create idmap files for pairs of (packages, overlay packages). + // Note: "android", ie framework-res.apk, is handled by native layers. + if (pkg.mOverlayTarget != null) { + // This is an overlay package. + if (pkg.mOverlayTarget != null && !pkg.mOverlayTarget.equals("android")) { + if (!mOverlays.containsKey(pkg.mOverlayTarget)) { + mOverlays.put(pkg.mOverlayTarget, + new HashMap<String, PackageParser.Package>()); + } + HashMap<String, PackageParser.Package> map = mOverlays.get(pkg.mOverlayTarget); + map.put(pkg.packageName, pkg); + PackageParser.Package orig = mPackages.get(pkg.mOverlayTarget); + if (orig != null && !createIdmapForPackagePairLI(orig, pkg)) { + mLastScanError = PackageManager.INSTALL_FAILED_UPDATE_INCOMPATIBLE; + return null; + } + } + } else if (mOverlays.containsKey(pkg.packageName) && + !pkg.packageName.equals("android")) { + // This is a regular package, with one or more known overlay packages. + createIdmapsForPackageLI(pkg); + } } return pkg; diff --git a/services/core/jni/com_android_server_ConsumerIrService.cpp b/services/core/jni/com_android_server_ConsumerIrService.cpp index 004c0aa..3a50ff7 100644 --- a/services/core/jni/com_android_server_ConsumerIrService.cpp +++ b/services/core/jni/com_android_server_ConsumerIrService.cpp @@ -29,7 +29,7 @@ namespace android { -static jint halOpen(JNIEnv *env, jobject obj) { +static jlong halOpen(JNIEnv *env, jobject obj) { hw_module_t const* module; consumerir_device_t *dev; int err; @@ -47,10 +47,10 @@ static jint halOpen(JNIEnv *env, jobject obj) { return 0; } - return reinterpret_cast<jint>(dev); + return reinterpret_cast<jlong>(dev); } -static jint halTransmit(JNIEnv *env, jobject obj, jint halObject, +static jint halTransmit(JNIEnv *env, jobject obj, jlong halObject, jint carrierFrequency, jintArray pattern) { int ret; @@ -67,8 +67,8 @@ static jint halTransmit(JNIEnv *env, jobject obj, jint halObject, } static jintArray halGetCarrierFrequencies(JNIEnv *env, jobject obj, - jint halObject) { - consumerir_device_t *dev = (consumerir_device_t *) halObject; + jlong halObject) { + consumerir_device_t *dev = reinterpret_cast<consumerir_device_t*>(halObject); consumerir_freq_range_t *ranges; int len; @@ -101,9 +101,9 @@ static jintArray halGetCarrierFrequencies(JNIEnv *env, jobject obj, } static JNINativeMethod method_table[] = { - { "halOpen", "()I", (void *)halOpen }, - { "halTransmit", "(II[I)I", (void *)halTransmit }, - { "halGetCarrierFrequencies", "(I)[I", (void *)halGetCarrierFrequencies}, + { "halOpen", "()J", (void *)halOpen }, + { "halTransmit", "(JI[I)I", (void *)halTransmit }, + { "halGetCarrierFrequencies", "(J)[I", (void *)halGetCarrierFrequencies}, }; int register_android_server_ConsumerIrService(JNIEnv *env) { diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java index f941ffe..d709c22 100644 --- a/services/java/com/android/server/SystemServer.java +++ b/services/java/com/android/server/SystemServer.java @@ -164,7 +164,7 @@ public final class SystemServer { // had to fallback to a different runtime because it is // running as root and we need to be the system user to set // the property. http://b/11463182 - SystemProperties.set("persist.sys.dalvik.vm.lib", VMRuntime.getRuntime().vmLibrary()); + SystemProperties.set("persist.sys.dalvik.vm.lib.1", VMRuntime.getRuntime().vmLibrary()); // Enable the sampling profiler. if (SamplingProfilerIntegration.isEnabled()) { diff --git a/tests/SystemUIDemoModeController/Android.mk b/tests/SystemUIDemoModeController/Android.mk new file mode 100644 index 0000000..64ea63c --- /dev/null +++ b/tests/SystemUIDemoModeController/Android.mk @@ -0,0 +1,10 @@ +LOCAL_PATH:= $(call my-dir) +include $(CLEAR_VARS) + +LOCAL_MODULE_TAGS := tests + +LOCAL_SRC_FILES := $(call all-subdir-java-files) + +LOCAL_PACKAGE_NAME := DemoModeController + +include $(BUILD_PACKAGE) diff --git a/tests/SystemUIDemoModeController/AndroidManifest.xml b/tests/SystemUIDemoModeController/AndroidManifest.xml new file mode 100644 index 0000000..2e97932 --- /dev/null +++ b/tests/SystemUIDemoModeController/AndroidManifest.xml @@ -0,0 +1,39 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2014 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> + +<manifest xmlns:android="http://schemas.android.com/apk/res/android" + package="com.example.android.demomodecontroller" + android:versionCode="1" + android:versionName="0.1" > + + <uses-sdk + android:minSdkVersion="19" + android:targetSdkVersion="19" /> + + <application + android:allowBackup="false" + android:label="@string/app_name" > + <activity + android:name=".DemoModeController" > + <intent-filter> + <action android:name="android.intent.action.MAIN" /> + <category android:name="android.intent.category.DEFAULT" /> + <category android:name="android.intent.category.LAUNCHER" /> + </intent-filter> + </activity> + </application> + +</manifest> diff --git a/tests/SystemUIDemoModeController/res/values/strings.xml b/tests/SystemUIDemoModeController/res/values/strings.xml new file mode 100644 index 0000000..257a353 --- /dev/null +++ b/tests/SystemUIDemoModeController/res/values/strings.xml @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2014 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> + +<resources> + + <string name="app_name">Demo Mode Controller</string> + <string name="help_text">"Drag: control icon states\nLong-press + drag: control background color\nDouble-tap: toggle bar mode</string> + +</resources> diff --git a/tests/SystemUIDemoModeController/src/com/example/android/demomodecontroller/DemoModeController.java b/tests/SystemUIDemoModeController/src/com/example/android/demomodecontroller/DemoModeController.java new file mode 100644 index 0000000..b177d7e --- /dev/null +++ b/tests/SystemUIDemoModeController/src/com/example/android/demomodecontroller/DemoModeController.java @@ -0,0 +1,340 @@ +/* + * Copyright (C) 2014 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.example.android.demomodecontroller; + +import android.app.Activity; +import android.content.Context; +import android.content.Intent; +import android.graphics.Color; +import android.graphics.PointF; +import android.os.Bundle; +import android.os.Handler; +import android.os.HandlerThread; +import android.os.SystemClock; +import android.util.Log; +import android.view.MotionEvent; +import android.view.View; +import android.view.View.OnTouchListener; +import android.view.ViewConfiguration; +import android.view.WindowManager; +import android.widget.Toast; + +public class DemoModeController extends Activity implements OnTouchListener { + private static final String TAG = DemoModeController.class.getSimpleName(); + private static final boolean DEBUG = false; + + private final Context mContext = this; + private final Handler mHandler = new Handler(); + private final PointF mLastDown = new PointF(); + + private View mContent; + private Handler mBackground; + private int mTouchSlop; + private long mLastDownTime; + private boolean mControllingColor; + private Toast mToast; + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + getWindow().addFlags(WindowManager.LayoutParams.FLAG_LAYOUT_IN_SCREEN + | WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS // so WM gives us enough room + | WindowManager.LayoutParams.FLAG_TRANSLUCENT_NAVIGATION); + getActionBar().hide(); + mContent = new View(mContext); + mContent.setBackgroundColor(0xff33b5e5); + mContent.setSystemUiVisibility(View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN + | View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION + | View.SYSTEM_UI_FLAG_LAYOUT_STABLE); + mContent.setOnTouchListener(this); + setContentView(mContent); + mTouchSlop = ViewConfiguration.get(mContext).getScaledTouchSlop(); + + final HandlerThread background = new HandlerThread("background"); + background.start(); + mBackground = new Handler(background.getLooper()); + updateMode(); + } + + @Override + protected void onPause() { + super.onPause(); + exitDemoMode(); + } + + @Override + protected void onResume() { + super.onResume(); + exitDemoMode(); + mToast = Toast.makeText(mContext, R.string.help_text, Toast.LENGTH_LONG); + mToast.show(); + } + + @Override + public boolean onTouch(View v, MotionEvent event) { + if (mToast != null) { + mToast.cancel(); + mToast = null; + } + final int action = event.getAction(); + if (action == MotionEvent.ACTION_DOWN) { + if (DEBUG) Log.d(TAG, "down"); + mHandler.postDelayed(mLongPressCheck, 500); + final long now = SystemClock.uptimeMillis(); + if (now - mLastDownTime < 200) { + toggleMode(); + } + mLastDownTime = now; + mLastDown.x = event.getX(); + mLastDown.y = event.getY(); + return true; + } + if (action == MotionEvent.ACTION_CANCEL || action == MotionEvent.ACTION_UP) { + if (DEBUG) Log.d(TAG, "upOrCancel"); + mControllingColor = false; + mHandler.removeCallbacks(mLongPressCheck); + } + if (action != MotionEvent.ACTION_MOVE) return false; + + float x = event.getX(); + float y = event.getY(); + if (Math.abs(mLastDown.x - x) > mTouchSlop || Math.abs(mLastDown.y - y) > mTouchSlop) { + mHandler.removeCallbacks(mLongPressCheck); + } + x = Math.max(x, 0); + y = Math.max(y, 0); + final int h = mContent.getMeasuredHeight(); + final int w = mContent.getMeasuredWidth(); + x = Math.min(x, w); + y = Math.min(y, h); + + y = h - y; + x = w - x; + + if (mControllingColor) { + final float hue = y / (h / 360); + final float sat = 1 - (x / (float)w); + final float val = x / (float)w; + final int color = Color.HSVToColor(new float[]{hue, sat, val}); + if (DEBUG) Log.d(TAG, String.format("hsv=(%s,%s,%s) argb=#%08x", hue, sat, val, color)); + mContent.setBackgroundColor(color); + return true; + } + + final int hh = (int)x / (w / 12); + if (hh != mHH) { + mHH = hh; + mBackground.removeCallbacks(mUpdateClock); + mBackground.post(mUpdateClock); + } + + final int mm = (int)y / (h / 60); + if (mm != mMM) { + mMM = mm; + mBackground.removeCallbacks(mUpdateClock); + mBackground.post(mUpdateClock); + } + + final int batteryLevel = (int)y / (h / 101); + if (batteryLevel != mBatteryLevel) { + mBatteryLevel = batteryLevel; + mBackground.removeCallbacks(mUpdateBattery); + mBackground.post(mUpdateBattery); + } + + final boolean batteryPlugged = x >= w / 2; + if (batteryPlugged != mBatteryPlugged) { + mBatteryPlugged = batteryPlugged; + mBackground.removeCallbacks(mUpdateBattery); + mBackground.post(mUpdateBattery); + } + + final int mobileLevel = (int)y / (h / 10); + if (mobileLevel != mMobileLevel) { + mMobileLevel = mobileLevel; + mBackground.removeCallbacks(mUpdateMobile); + mBackground.post(mUpdateMobile); + } + + final int wifiLevel = (int)y / (h / 10); + if (wifiLevel != mWifiLevel) { + mWifiLevel = wifiLevel; + mBackground.removeCallbacks(mUpdateWifi); + mBackground.post(mUpdateWifi); + } + + final int statusSlots = (int)x / (w / 13); + if (statusSlots != mStatusSlots) { + mStatusSlots = statusSlots; + mBackground.removeCallbacks(mUpdateStatus); + mBackground.post(mUpdateStatus); + } + + final int networkIcons = (int)x / (w / 4); + if (networkIcons != mNetworkIcons) { + mNetworkIcons = networkIcons; + mBackground.removeCallbacks(mUpdateNetwork); + mBackground.post(mUpdateNetwork); + } + + final int mobileDataType = (int)y / (h / 9); + if (mobileDataType != mMobileDataType) { + mMobileDataType = mobileDataType; + mBackground.removeCallbacks(mUpdateMobile); + mBackground.post(mUpdateMobile); + } + return true; + } + + private void toggleMode() { + if (DEBUG) Log.d(TAG, "toggleMode"); + mBarMode = (mBarMode + 1) % 3; + updateMode(); + } + + private void updateMode() { + mBackground.removeCallbacks(mUpdateBarMode); + mBackground.post(mUpdateBarMode); + } + + private final Runnable mLongPressCheck = new Runnable() { + @Override + public void run() { + if (DEBUG) Log.d(TAG, "mControllingColor = true"); + mControllingColor = true; + + } + }; + + private void exitDemoMode() { + if (DEBUG) Log.d(TAG, "exitDemoMode"); + final Intent intent = new Intent("com.android.systemui.demo"); + intent.putExtra("command", "exit"); + mContext.sendBroadcast(intent); + } + + private int mStatusSlots; // 0 - 12 + private final Runnable mUpdateStatus = new Runnable() { + @Override + public void run() { + final Intent intent = new Intent("com.android.systemui.demo"); + intent.putExtra("command", "status"); + intent.putExtra("volume", mStatusSlots < 1 ? "hide" + : mStatusSlots < 2 ? "silent" : "vibrate"); + intent.putExtra("bluetooth", mStatusSlots < 3 ? "hide" + : mStatusSlots < 4 ? "disconnected" : "connected"); + intent.putExtra("location", mStatusSlots < 5 ? "hide" : "show"); + intent.putExtra("alarm", mStatusSlots < 6 ? "hide" : "show"); + intent.putExtra("sync", mStatusSlots < 7 ? "hide" : "show"); + intent.putExtra("tty", mStatusSlots < 8 ? "hide" : "show"); + intent.putExtra("eri", mStatusSlots < 9 ? "hide" : "show"); + intent.putExtra("secure", mStatusSlots < 10 ? "hide" : "show"); + intent.putExtra("mute", mStatusSlots < 11 ? "hide" : "show"); + intent.putExtra("speakerphone", mStatusSlots < 12 ? "hide" : "show"); + mContext.sendBroadcast(intent); + } + }; + + private int mNetworkIcons; // 0:airplane 1:mobile 2:airplane+wifi 3:mobile+wifi + private final Runnable mUpdateNetwork = new Runnable() { + @Override + public void run() { + final Intent intent = new Intent("com.android.systemui.demo"); + intent.putExtra("command", "network"); + intent.putExtra("airplane", mNetworkIcons % 2 == 0 ? "show" : "hide"); + intent.putExtra("wifi", mNetworkIcons >= 2 ? "show" : "hide"); + intent.putExtra("mobile", mNetworkIcons % 2 == 1 ? "show" : "hide"); + mContext.sendBroadcast(intent); + } + }; + + private int mWifiLevel; // 0 - 4, 5 - 9, fully + private final Runnable mUpdateWifi = new Runnable() { + @Override + public void run() { + final Intent intent = new Intent("com.android.systemui.demo"); + intent.putExtra("command", "network"); + intent.putExtra("wifi", mNetworkIcons >= 2 ? "show" : "hide"); + intent.putExtra("level", Integer.toString(mWifiLevel % 5)); + intent.putExtra("fully", Boolean.toString(mWifiLevel > 4)); + mContext.sendBroadcast(intent); + } + }; + + private int mMobileLevel; // 0 - 4, 5 - 9, fully + private int mMobileDataType; // 0 - 8 + private static final String getDataType(int dataType) { + if (dataType == 1) return "1x"; + if (dataType == 2) return "3g"; + if (dataType == 3) return "4g"; + if (dataType == 4) return "e"; + if (dataType == 5) return "g"; + if (dataType == 6) return "h"; + if (dataType == 7) return "lte"; + if (dataType == 8) return "roam"; + return ""; + } + private final Runnable mUpdateMobile = new Runnable() { + @Override + public void run() { + final Intent intent = new Intent("com.android.systemui.demo"); + intent.putExtra("command", "network"); + intent.putExtra("mobile", mNetworkIcons % 2 == 1 ? "show" : "hide"); + intent.putExtra("level", Integer.toString(mMobileLevel % 5)); + intent.putExtra("fully", Boolean.toString(mMobileLevel > 4)); + intent.putExtra("datatype", getDataType(mMobileDataType)); + mContext.sendBroadcast(intent); + } + }; + + private boolean mBatteryPlugged; + private int mBatteryLevel; // 0 - 100 + private final Runnable mUpdateBattery = new Runnable() { + @Override + public void run() { + final Intent intent = new Intent("com.android.systemui.demo"); + intent.putExtra("command", "battery"); + intent.putExtra("level", Integer.toString(mBatteryLevel)); + intent.putExtra("plugged", Boolean.toString(mBatteryPlugged)); + mContext.sendBroadcast(intent); + } + }; + + private int mHH; // 0 - 11 + private int mMM; // 0 - 59 + private final Runnable mUpdateClock = new Runnable() { + @Override + public void run() { + final Intent intent = new Intent("com.android.systemui.demo"); + intent.putExtra("command", "clock"); + intent.putExtra("hhmm", String.format("%02d%02d", mHH + 1, mMM)); + mContext.sendBroadcast(intent); + } + }; + + private int mBarMode; // 0 - 2 (opaque, semi-transparent, translucent) + private final Runnable mUpdateBarMode = new Runnable() { + @Override + public void run() { + final Intent intent = new Intent("com.android.systemui.demo"); + intent.putExtra("command", "bars"); + intent.putExtra("mode", mBarMode == 1 ? "semi-transparent" + : mBarMode == 2 ? "translucent" : "opaque"); + mContext.sendBroadcast(intent); + } + }; +} diff --git a/tools/aapt/AaptAssets.cpp b/tools/aapt/AaptAssets.cpp index 62200d9..8133d26 100644 --- a/tools/aapt/AaptAssets.cpp +++ b/tools/aapt/AaptAssets.cpp @@ -2662,7 +2662,7 @@ status_t AaptAssets::addIncludedResources(const sp<AaptFile>& file) { const ResTable& res = getIncludedResources(); // XXX dirty! - return const_cast<ResTable&>(res).add(file->getData(), file->getSize(), NULL); + return const_cast<ResTable&>(res).add(file->getData(), file->getSize()); } const ResTable& AaptAssets::getIncludedResources() const diff --git a/tools/aapt/Resource.cpp b/tools/aapt/Resource.cpp index 386888b..57d44f2 100644 --- a/tools/aapt/Resource.cpp +++ b/tools/aapt/Resource.cpp @@ -1320,8 +1320,7 @@ status_t buildResources(Bundle* bundle, const sp<AaptAssets>& assets) } // Read resources back in, - finalResTable.add(resFile->getData(), resFile->getSize(), NULL); - + finalResTable.add(resFile->getData(), resFile->getSize()); #if 0 NOISY( printf("Generated resources:\n"); diff --git a/tools/layoutlib/bridge/src/android/animation/PropertyValuesHolder_Delegate.java b/tools/layoutlib/bridge/src/android/animation/PropertyValuesHolder_Delegate.java index 7b444aa..224eac6 100644 --- a/tools/layoutlib/bridge/src/android/animation/PropertyValuesHolder_Delegate.java +++ b/tools/layoutlib/bridge/src/android/animation/PropertyValuesHolder_Delegate.java @@ -36,24 +36,24 @@ import com.android.tools.layoutlib.annotations.LayoutlibDelegate; /*package*/ class PropertyValuesHolder_Delegate { @LayoutlibDelegate - /*package*/ static int nGetIntMethod(Class<?> targetClass, String methodName) { + /*package*/ static long nGetIntMethod(Class<?> targetClass, String methodName) { // return 0 to force PropertyValuesHolder to use Java reflection. return 0; } @LayoutlibDelegate - /*package*/ static int nGetFloatMethod(Class<?> targetClass, String methodName) { + /*package*/ static long nGetFloatMethod(Class<?> targetClass, String methodName) { // return 0 to force PropertyValuesHolder to use Java reflection. return 0; } @LayoutlibDelegate - /*package*/ static void nCallIntMethod(Object target, int methodID, int arg) { + /*package*/ static void nCallIntMethod(Object target, long methodID, int arg) { // do nothing } @LayoutlibDelegate - /*package*/ static void nCallFloatMethod(Object target, int methodID, float arg) { + /*package*/ static void nCallFloatMethod(Object target, long methodID, float arg) { // do nothing } } diff --git a/tools/layoutlib/bridge/src/android/graphics/BitmapFactory_Delegate.java b/tools/layoutlib/bridge/src/android/graphics/BitmapFactory_Delegate.java index d85c3d1..06673c1 100644 --- a/tools/layoutlib/bridge/src/android/graphics/BitmapFactory_Delegate.java +++ b/tools/layoutlib/bridge/src/android/graphics/BitmapFactory_Delegate.java @@ -102,7 +102,7 @@ import java.util.Set; } @LayoutlibDelegate - /*package*/ static Bitmap nativeDecodeAsset(int asset, Rect padding, Options opts) { + /*package*/ static Bitmap nativeDecodeAsset(long asset, Rect padding, Options opts) { opts.inBitmap = null; return null; } diff --git a/tools/layoutlib/bridge/src/android/graphics/Canvas_Delegate.java b/tools/layoutlib/bridge/src/android/graphics/Canvas_Delegate.java index 9d21866..73d274c 100644 --- a/tools/layoutlib/bridge/src/android/graphics/Canvas_Delegate.java +++ b/tools/layoutlib/bridge/src/android/graphics/Canvas_Delegate.java @@ -786,7 +786,7 @@ public final class Canvas_Delegate { } @LayoutlibDelegate - /*package*/ static void native_drawPath(long nativeCanvas, int path, long paint) { + /*package*/ static void native_drawPath(long nativeCanvas, long path, long paint) { final Path_Delegate pathDelegate = Path_Delegate.getDelegate(path); if (pathDelegate == null) { return; diff --git a/tools/layoutlib/bridge/src/android/graphics/Matrix_Delegate.java b/tools/layoutlib/bridge/src/android/graphics/Matrix_Delegate.java index 1d66586..ebfe9bc 100644 --- a/tools/layoutlib/bridge/src/android/graphics/Matrix_Delegate.java +++ b/tools/layoutlib/bridge/src/android/graphics/Matrix_Delegate.java @@ -654,7 +654,7 @@ public final class Matrix_Delegate { } @LayoutlibDelegate - /*package*/ static boolean native_invert(long native_object, int inverse) { + /*package*/ static boolean native_invert(long native_object, long inverse) { Matrix_Delegate d = sManager.getDelegate(native_object); if (d == null) { return false; |
