diff options
29 files changed, 349 insertions, 212 deletions
diff --git a/core/java/android/content/res/AssetManager.java b/core/java/android/content/res/AssetManager.java index 418bdda..9ce17e4 100644 --- a/core/java/android/content/res/AssetManager.java +++ b/core/java/android/content/res/AssetManager.java @@ -537,7 +537,7 @@ public final class AssetManager { public final class AssetInputStream extends InputStream { public final int getAssetInt() { - return (int) mAsset; + throw new UnsupportedOperationException(); } /** * @hide diff --git a/core/java/android/net/LocalSocketImpl.java b/core/java/android/net/LocalSocketImpl.java index b2ee50a..119e533 100644 --- a/core/java/android/net/LocalSocketImpl.java +++ b/core/java/android/net/LocalSocketImpl.java @@ -326,6 +326,7 @@ class LocalSocketImpl } s.fd = accept(fd, s); + s.mFdCreatedInternally = true; } /** @@ -536,4 +537,3 @@ class LocalSocketImpl close(); } } - diff --git a/core/java/android/net/nsd/NsdManager.java b/core/java/android/net/nsd/NsdManager.java index 9c3e405..7b2c623 100644 --- a/core/java/android/net/nsd/NsdManager.java +++ b/core/java/android/net/nsd/NsdManager.java @@ -301,27 +301,36 @@ public final class NsdManager { @Override public void handleMessage(Message message) { - Object listener = getListener(message.arg2); - boolean listenerRemove = true; switch (message.what) { case AsyncChannel.CMD_CHANNEL_HALF_CONNECTED: mAsyncChannel.sendMessage(AsyncChannel.CMD_CHANNEL_FULL_CONNECTION); - break; + return; case AsyncChannel.CMD_CHANNEL_FULLY_CONNECTED: mConnected.countDown(); - break; + return; case AsyncChannel.CMD_CHANNEL_DISCONNECTED: Log.e(TAG, "Channel lost"); + return; + default: break; + } + Object listener = getListener(message.arg2); + if (listener == null) { + Log.d(TAG, "Stale key " + message.arg2); + return; + } + boolean listenerRemove = true; + NsdServiceInfo ns = getNsdService(message.arg2); + switch (message.what) { case DISCOVER_SERVICES_STARTED: - String s = ((NsdServiceInfo) message.obj).getServiceType(); + String s = getNsdServiceInfoType((NsdServiceInfo) message.obj); ((DiscoveryListener) listener).onDiscoveryStarted(s); // Keep listener until stop discovery listenerRemove = false; break; case DISCOVER_SERVICES_FAILED: - ((DiscoveryListener) listener).onStartDiscoveryFailed( - getNsdService(message.arg2).getServiceType(), message.arg1); + ((DiscoveryListener) listener).onStartDiscoveryFailed(getNsdServiceInfoType(ns), + message.arg1); break; case SERVICE_FOUND: ((DiscoveryListener) listener).onServiceFound((NsdServiceInfo) message.obj); @@ -334,16 +343,14 @@ public final class NsdManager { listenerRemove = false; break; case STOP_DISCOVERY_FAILED: - ((DiscoveryListener) listener).onStopDiscoveryFailed( - getNsdService(message.arg2).getServiceType(), message.arg1); + ((DiscoveryListener) listener).onStopDiscoveryFailed(getNsdServiceInfoType(ns), + message.arg1); break; case STOP_DISCOVERY_SUCCEEDED: - ((DiscoveryListener) listener).onDiscoveryStopped( - getNsdService(message.arg2).getServiceType()); + ((DiscoveryListener) listener).onDiscoveryStopped(getNsdServiceInfoType(ns)); break; case REGISTER_SERVICE_FAILED: - ((RegistrationListener) listener).onRegistrationFailed( - getNsdService(message.arg2), message.arg1); + ((RegistrationListener) listener).onRegistrationFailed(ns, message.arg1); break; case REGISTER_SERVICE_SUCCEEDED: ((RegistrationListener) listener).onServiceRegistered( @@ -352,16 +359,13 @@ public final class NsdManager { listenerRemove = false; break; case UNREGISTER_SERVICE_FAILED: - ((RegistrationListener) listener).onUnregistrationFailed( - getNsdService(message.arg2), message.arg1); + ((RegistrationListener) listener).onUnregistrationFailed(ns, message.arg1); break; case UNREGISTER_SERVICE_SUCCEEDED: - ((RegistrationListener) listener).onServiceUnregistered( - getNsdService(message.arg2)); + ((RegistrationListener) listener).onServiceUnregistered(ns); break; case RESOLVE_SERVICE_FAILED: - ((ResolveListener) listener).onResolveFailed( - getNsdService(message.arg2), message.arg1); + ((ResolveListener) listener).onResolveFailed(ns, message.arg1); break; case RESOLVE_SERVICE_SUCCEEDED: ((ResolveListener) listener).onServiceResolved((NsdServiceInfo) message.obj); @@ -421,6 +425,11 @@ public final class NsdManager { } + private String getNsdServiceInfoType(NsdServiceInfo s) { + if (s == null) return "?"; + return s.getServiceType(); + } + /** * Initialize AsyncChannel */ diff --git a/core/jni/AndroidRuntime.cpp b/core/jni/AndroidRuntime.cpp index 2215dd7..96f0d6c 100644 --- a/core/jni/AndroidRuntime.cpp +++ b/core/jni/AndroidRuntime.cpp @@ -395,16 +395,16 @@ static void readLocale(char* language, char* region) * * This will cut up "extraOptsBuf" as we chop it into individual options. * + * If "quotingArg" is non-null, it is passed before each extra option in mOptions. + * * Adds the strings, if any, to mOptions. */ -void AndroidRuntime::parseExtraOpts(char* extraOptsBuf) +void AndroidRuntime::parseExtraOpts(char* extraOptsBuf, const char* quotingArg) { JavaVMOption opt; - char* start; - char* end; - memset(&opt, 0, sizeof(opt)); - start = extraOptsBuf; + char* start = extraOptsBuf; + char* end = NULL; while (*start != '\0') { while (*start == ' ') /* skip leading whitespace */ start++; @@ -418,6 +418,11 @@ void AndroidRuntime::parseExtraOpts(char* extraOptsBuf) *end++ = '\0'; /* mark end, advance to indicate more */ opt.optionString = start; + if (quotingArg != NULL) { + JavaVMOption quotingOpt; + quotingOpt.optionString = quotingArg; + mOptions.add(quotingOpt); + } mOptions.add(opt); start = end; } @@ -449,6 +454,9 @@ int AndroidRuntime::startVm(JavaVM** pJavaVM, JNIEnv** pEnv) char gctypeOptsBuf[sizeof("-Xgc:")-1 + PROPERTY_VALUE_MAX]; char heaptargetutilizationOptsBuf[sizeof("-XX:HeapTargetUtilization=")-1 + PROPERTY_VALUE_MAX]; char jitcodecachesizeOptsBuf[sizeof("-Xjitcodecachesize:")-1 + PROPERTY_VALUE_MAX]; + char dalvikVmLibBuf[PROPERTY_VALUE_MAX]; + char dex2oatFlagsBuf[PROPERTY_VALUE_MAX]; + char dex2oatImageFlagsBuf[PROPERTY_VALUE_MAX]; char extraOptsBuf[PROPERTY_VALUE_MAX]; char* stackTraceFile = NULL; bool checkJni = false; @@ -741,9 +749,22 @@ int AndroidRuntime::startVm(JavaVM** pJavaVM, JNIEnv** pEnv) mOptions.add(opt); } + // libart tolerates libdvm flags, but not vice versa, so only pass these if libart. + property_get("persist.sys.dalvik.vm.lib.1", dalvikVmLibBuf, "libdvm.so"); + if (strncmp(dalvikVmLibBuf, "libart", 6) == 0) { + + // Extra options for DexClassLoader. + property_get("dalvik.vm.dex2oat-flags", dex2oatFlagsBuf, ""); + parseExtraOpts(dex2oatFlagsBuf, "-Xcompiler-option"); + + // Extra options for boot.art/boot.oat image generation. + property_get("dalvik.vm.image-dex2oat-flags", dex2oatImageFlagsBuf, ""); + parseExtraOpts(dex2oatImageFlagsBuf, "-Ximage-compiler-option"); + } + /* extra options; parse this late so it overrides others */ property_get("dalvik.vm.extra-opts", extraOptsBuf, ""); - parseExtraOpts(extraOptsBuf); + parseExtraOpts(extraOptsBuf, NULL); /* Set the properties for locale */ { diff --git a/core/jni/android_media_AudioRecord.cpp b/core/jni/android_media_AudioRecord.cpp index b22668b..ab70f25 100644 --- a/core/jni/android_media_AudioRecord.cpp +++ b/core/jni/android_media_AudioRecord.cpp @@ -18,6 +18,7 @@ #define LOG_TAG "AudioRecord-JNI" +#include <inttypes.h> #include <jni.h> #include <JNIHelp.h> #include <android_runtime/AndroidRuntime.h> @@ -316,7 +317,7 @@ static void android_media_AudioRecord_release(JNIEnv *env, jobject thiz) { if (lpRecorder == NULL) { return; } - ALOGV("About to delete lpRecorder: %x\n", (int)lpRecorder.get()); + ALOGV("About to delete lpRecorder: %" PRIxPTR "\n", lpRecorder.get()); lpRecorder->stop(); audiorecord_callback_cookie *lpCookie = (audiorecord_callback_cookie *)env->GetLongField( @@ -329,7 +330,7 @@ static void android_media_AudioRecord_release(JNIEnv *env, jobject thiz) { // delete the callback information if (lpCookie) { Mutex::Autolock l(sLock); - ALOGV("deleting lpCookie: %x\n", (int)lpCookie); + ALOGV("deleting lpCookie: %" PRIxPTR "\n", lpCookie); while (lpCookie->busy) { if (lpCookie->cond.waitRelative(sLock, milliseconds(CALLBACK_COND_WAIT_TIMEOUT_MS)) != diff --git a/core/jni/android_opengl_EGL14.cpp b/core/jni/android_opengl_EGL14.cpp index bf65dfc..19e4d99 100644 --- a/core/jni/android_opengl_EGL14.cpp +++ b/core/jni/android_opengl_EGL14.cpp @@ -156,7 +156,7 @@ static jobject android_eglGetDisplayInt (JNIEnv *_env, jobject _this, jint display_id) { - if (sizeof(void*) != sizeof(uint32_t)) { + if ((EGLNativeDisplayType)display_id != EGL_DEFAULT_DISPLAY) { jniThrowException(_env, "java/lang/UnsupportedOperationException", "eglGetDisplay"); return 0; } diff --git a/data/fonts/system_fonts.xml b/data/fonts/system_fonts.xml index 16e4c7c..549f061b 100644 --- a/data/fonts/system_fonts.xml +++ b/data/fonts/system_fonts.xml @@ -75,7 +75,6 @@ <name>baskerville</name> <name>goudy</name> <name>fantasy</name> - <name>cursive</name> <name>ITC Stone Serif</name> </nameset> <fileset> @@ -108,4 +107,32 @@ </fileset> </family> + <family> + <nameset> + <name>casual</name> + </nameset> + <fileset> + <file>ComingSoon.ttf</file> + </fileset> + </family> + + <family> + <nameset> + <name>cursive</name> + </nameset> + <fileset> + <file>DancingScript-Regular.ttf</file> + <file>DancingScript-Bold.ttf</file> + </fileset> + </family> + + <family> + <nameset> + <name>sans-serif-smallcaps</name> + </nameset> + <fileset> + <file>CarroisGothicSC-Regular.ttf</file> + </fileset> + </family> + </familyset> diff --git a/include/android_runtime/AndroidRuntime.h b/include/android_runtime/AndroidRuntime.h index 0b3ce9a..649f4c3 100644 --- a/include/android_runtime/AndroidRuntime.h +++ b/include/android_runtime/AndroidRuntime.h @@ -115,7 +115,7 @@ public: private: static int startReg(JNIEnv* env); - void parseExtraOpts(char* extraOptsBuf); + void parseExtraOpts(char* extraOptsBuf, const char* quotingArg); int startVm(JavaVM** pJavaVM, JNIEnv** pEnv); Vector<JavaVMOption> mOptions; diff --git a/libs/androidfw/BackupHelpers.cpp b/libs/androidfw/BackupHelpers.cpp index b8d3f48..302fbf6 100644 --- a/libs/androidfw/BackupHelpers.cpp +++ b/libs/androidfw/BackupHelpers.cpp @@ -1083,7 +1083,7 @@ backup_helper_test_four() } if (readSnapshot.size() != 4) { - fprintf(stderr, "readSnapshot should be length 4 is %d\n", readSnapshot.size()); + fprintf(stderr, "readSnapshot should be length 4 is %zu\n", readSnapshot.size()); return 1; } @@ -1095,8 +1095,8 @@ backup_helper_test_four() if (name != filenames[i] || states[i].modTime_sec != state.modTime_sec || states[i].modTime_nsec != state.modTime_nsec || states[i].mode != state.mode || states[i].size != state.size || states[i].crc32 != states[i].crc32) { - fprintf(stderr, "state %d expected={%d/%d, 0x%08x, %04o, 0x%08x, %3d} '%s'\n" - " actual={%d/%d, 0x%08x, %04o, 0x%08x, %3d} '%s'\n", i, + fprintf(stderr, "state %zu expected={%d/%d, 0x%08x, %04o, 0x%08x, %3d} '%s'\n" + " actual={%d/%d, 0x%08x, %04o, 0x%08x, %3zu} '%s'\n", i, states[i].modTime_sec, states[i].modTime_nsec, states[i].mode, states[i].size, states[i].crc32, name.length(), filenames[i].string(), state.modTime_sec, state.modTime_nsec, state.mode, state.size, state.crc32, @@ -1230,7 +1230,7 @@ test_read_header_and_entity(BackupDataReader& reader, const char* str) goto finished; } if ((int)actualSize != bufSize) { - fprintf(stderr, "ReadEntityHeader expected dataSize 0x%08x got 0x%08x\n", bufSize, + fprintf(stderr, "ReadEntityHeader expected dataSize 0x%08x got 0x%08zx\n", bufSize, actualSize); err = EINVAL; goto finished; diff --git a/libs/hwui/PatchCache.cpp b/libs/hwui/PatchCache.cpp index dc0d98c..8a44604 100644 --- a/libs/hwui/PatchCache.cpp +++ b/libs/hwui/PatchCache.cpp @@ -129,7 +129,11 @@ void PatchCache::clearGarbage() { Mutex::Autolock _l(mLock); size_t count = mGarbage.size(); for (size_t i = 0; i < count; i++) { - remove(patchesToRemove, mGarbage[i]); + Res_png_9patch* patch = mGarbage[i]; + remove(patchesToRemove, patch); + // A Res_png_9patch is actually an array of byte that's larger + // than sizeof(Res_png_9patch). It must be freed as an array. + delete[] (int8_t*) patch; } mGarbage.clear(); } diff --git a/libs/hwui/PathCache.cpp b/libs/hwui/PathCache.cpp index 5df6408..cf8adf8 100644 --- a/libs/hwui/PathCache.cpp +++ b/libs/hwui/PathCache.cpp @@ -395,7 +395,9 @@ void PathCache::clearGarbage() { Mutex::Autolock l(mLock); size_t count = mGarbage.size(); for (size_t i = 0; i < count; i++) { - remove(pathsToRemove, mGarbage.itemAt(i)); + const path_pair_t& pair = mGarbage.itemAt(i); + remove(pathsToRemove, pair); + delete pair.getFirst(); } mGarbage.clear(); } diff --git a/libs/hwui/ResourceCache.cpp b/libs/hwui/ResourceCache.cpp index 3f77021..d276a29 100644 --- a/libs/hwui/ResourceCache.cpp +++ b/libs/hwui/ResourceCache.cpp @@ -213,8 +213,9 @@ void ResourceCache::destructorLocked(SkPath* resource) { // If we're not tracking this resource, just delete it if (Caches::hasInstance()) { Caches::getInstance().pathCache.removeDeferred(resource); + } else { + delete resource; } - delete resource; return; } ref->destroyed = true; @@ -235,8 +236,9 @@ void ResourceCache::destructorLocked(SkBitmap* resource) { // If we're not tracking this resource, just delete it if (Caches::hasInstance()) { Caches::getInstance().textureCache.removeDeferred(resource); + } else { + delete resource; } - delete resource; return; } ref->destroyed = true; @@ -292,13 +294,14 @@ void ResourceCache::destructorLocked(Res_png_9patch* resource) { ssize_t index = mCache->indexOfKey(resource); ResourceReference* ref = index >= 0 ? mCache->valueAt(index) : NULL; if (ref == NULL) { + // If we're not tracking this resource, just delete it if (Caches::hasInstance()) { Caches::getInstance().patchCache.removeDeferred(resource); + } else { + // A Res_png_9patch is actually an array of byte that's larger + // than sizeof(Res_png_9patch). It must be freed as an array. + delete[] (int8_t*) resource; } - // If we're not tracking this resource, just delete it - // A Res_png_9patch is actually an array of byte that's larger - // than sizeof(Res_png_9patch). It must be freed as an array. - delete[] (int8_t*) resource; return; } ref->destroyed = true; @@ -355,16 +358,18 @@ void ResourceCache::deleteResourceReferenceLocked(void* resource, ResourceRefere SkBitmap* bitmap = (SkBitmap*) resource; if (Caches::hasInstance()) { Caches::getInstance().textureCache.removeDeferred(bitmap); + } else { + delete bitmap; } - delete bitmap; } break; case kPath: { SkPath* path = (SkPath*) resource; if (Caches::hasInstance()) { Caches::getInstance().pathCache.removeDeferred(path); + } else { + delete path; } - delete path; } break; case kShader: { @@ -380,11 +385,12 @@ void ResourceCache::deleteResourceReferenceLocked(void* resource, ResourceRefere case kNinePatch: { if (Caches::hasInstance()) { Caches::getInstance().patchCache.removeDeferred((Res_png_9patch*) resource); + } else { + // A Res_png_9patch is actually an array of byte that's larger + // than sizeof(Res_png_9patch). It must be freed as an array. + int8_t* patch = (int8_t*) resource; + delete[] patch; } - // A Res_png_9patch is actually an array of byte that's larger - // than sizeof(Res_png_9patch). It must be freed as an array. - int8_t* patch = (int8_t*) resource; - delete[] patch; } break; case kLayer: { diff --git a/libs/hwui/TextureCache.cpp b/libs/hwui/TextureCache.cpp index ed0a79a..ad235a9 100644 --- a/libs/hwui/TextureCache.cpp +++ b/libs/hwui/TextureCache.cpp @@ -184,7 +184,9 @@ void TextureCache::clearGarbage() { Mutex::Autolock _l(mLock); size_t count = mGarbage.size(); for (size_t i = 0; i < count; i++) { - mCache.remove(mGarbage.itemAt(i)); + SkBitmap* bitmap = mGarbage.itemAt(i); + mCache.remove(bitmap); + delete bitmap; } mGarbage.clear(); } diff --git a/opengl/java/android/opengl/EGL14.java b/opengl/java/android/opengl/EGL14.java index b6dd9c2..cf09c58 100644 --- a/opengl/java/android/opengl/EGL14.java +++ b/opengl/java/android/opengl/EGL14.java @@ -155,12 +155,11 @@ public static final int EGL_CORE_NATIVE_ENGINE = 0x305B; ); // C function EGLDisplay eglGetDisplay ( EGLNativeDisplayType display_id ) - // TODO Deprecate the eglGetDisplay(int) API method public static native EGLDisplay eglGetDisplay( int display_id ); - // TODO Unhide the eglGetDisplay(long) API method + /** * {@hide} */ diff --git a/rs/java/android/renderscript/BaseObj.java b/rs/java/android/renderscript/BaseObj.java index b386dd7..1372ab7 100644 --- a/rs/java/android/renderscript/BaseObj.java +++ b/rs/java/android/renderscript/BaseObj.java @@ -181,6 +181,10 @@ public class BaseObj { if (this == obj) return true; + if (obj == null) { + return false; + } + if (getClass() != obj.getClass()) { return false; } diff --git a/rs/java/android/renderscript/Element.java b/rs/java/android/renderscript/Element.java index 2932770..aa5d687 100644 --- a/rs/java/android/renderscript/Element.java +++ b/rs/java/android/renderscript/Element.java @@ -803,8 +803,6 @@ 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); @@ -831,7 +829,7 @@ public class Element extends BaseObj { mArraySizes = new int[numSubElements]; mOffsetInBytes = new int[numSubElements]; - int[] subElementIds = new int[numSubElements]; + long[] subElementIds = new long[numSubElements]; mRS.nElementGetSubElements(getID(mRS), subElementIds, mElementNames, mArraySizes); for(int i = 0; i < numSubElements; i ++) { mElements[i] = new Element(subElementIds[i], mRS); @@ -1090,10 +1088,9 @@ 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]; + long[] ids = new long[ein.length]; for (int ct = 0; ct < ein.length; ct++ ) { - ids[ct] = (int)ein[ct].getID(mRS); + ids[ct] = ein[ct].getID(mRS); } long id = mRS.nElementCreate2(ids, sin, asin); return new Element(id, mRS, ein, sin, asin); diff --git a/rs/java/android/renderscript/Mesh.java b/rs/java/android/renderscript/Mesh.java index 9ce3fb2..ca0da9d 100644 --- a/rs/java/android/renderscript/Mesh.java +++ b/rs/java/android/renderscript/Mesh.java @@ -154,8 +154,8 @@ public class Mesh extends BaseObj { int vtxCount = mRS.nMeshGetVertexBufferCount(getID(mRS)); int idxCount = mRS.nMeshGetIndexCount(getID(mRS)); - int[] vtxIDs = new int[vtxCount]; - int[] idxIDs = new int[idxCount]; + long[] vtxIDs = new long[vtxCount]; + long[] idxIDs = new long[idxCount]; int[] primitives = new int[idxCount]; mRS.nMeshGetVertices(getID(mRS), vtxIDs, vtxCount); @@ -350,8 +350,8 @@ public class Mesh extends BaseObj { **/ public Mesh create() { mRS.validate(); - int[] vtx = new int[mVertexTypeCount]; - int[] idx = new int[mIndexTypes.size()]; + long[] vtx = new long[mVertexTypeCount]; + long[] idx = new long[mIndexTypes.size()]; int[] prim = new int[mIndexTypes.size()]; Allocation[] vertexBuffers = new Allocation[mVertexTypeCount]; @@ -367,7 +367,7 @@ public class Mesh extends BaseObj { alloc = Allocation.createSized(mRS, entry.e, entry.size, mUsage); } vertexBuffers[ct] = alloc; - vtx[ct] = (int)alloc.getID(mRS); + vtx[ct] = alloc.getID(mRS); } for(int ct = 0; ct < mIndexTypes.size(); ct ++) { @@ -382,7 +382,7 @@ public class Mesh extends BaseObj { indexBuffers[ct] = alloc; primitives[ct] = entry.prim; - idx[ct] = (int)allocID; + idx[ct] = allocID; prim[ct] = entry.prim.mID; } @@ -506,8 +506,8 @@ public class Mesh extends BaseObj { public Mesh create() { mRS.validate(); - int[] vtx = new int[mVertexTypeCount]; - int[] idx = new int[mIndexTypes.size()]; + long[] vtx = new long[mVertexTypeCount]; + long[] idx = new long[mIndexTypes.size()]; int[] prim = new int[mIndexTypes.size()]; Allocation[] indexBuffers = new Allocation[mIndexTypes.size()]; @@ -517,7 +517,7 @@ public class Mesh extends BaseObj { for(int ct = 0; ct < mVertexTypeCount; ct ++) { Entry entry = mVertexTypes[ct]; vertexBuffers[ct] = entry.a; - vtx[ct] = (int)entry.a.getID(mRS); + vtx[ct] = entry.a.getID(mRS); } for(int ct = 0; ct < mIndexTypes.size(); ct ++) { @@ -526,7 +526,7 @@ public class Mesh extends BaseObj { indexBuffers[ct] = entry.a; primitives[ct] = entry.prim; - idx[ct] = (int)allocID; + idx[ct] = allocID; prim[ct] = entry.prim.mID; } diff --git a/rs/java/android/renderscript/ProgramFragment.java b/rs/java/android/renderscript/ProgramFragment.java index 5e886a3..4bb527b 100644 --- a/rs/java/android/renderscript/ProgramFragment.java +++ b/rs/java/android/renderscript/ProgramFragment.java @@ -65,25 +65,25 @@ public class ProgramFragment extends Program { */ public ProgramFragment create() { mRS.validate(); - int[] tmp = new int[(mInputCount + mOutputCount + mConstantCount + mTextureCount) * 2]; + long[] tmp = new long[(mInputCount + mOutputCount + mConstantCount + mTextureCount) * 2]; String[] texNames = new String[mTextureCount]; int idx = 0; for (int i=0; i < mInputCount; i++) { tmp[idx++] = ProgramParam.INPUT.mID; - tmp[idx++] = (int)mInputs[i].getID(mRS); + tmp[idx++] = mInputs[i].getID(mRS); } for (int i=0; i < mOutputCount; i++) { tmp[idx++] = ProgramParam.OUTPUT.mID; - tmp[idx++] = (int)mOutputs[i].getID(mRS); + tmp[idx++] = mOutputs[i].getID(mRS); } for (int i=0; i < mConstantCount; i++) { tmp[idx++] = ProgramParam.CONSTANT.mID; - tmp[idx++] = (int)mConstants[i].getID(mRS); + tmp[idx++] = mConstants[i].getID(mRS); } for (int i=0; i < mTextureCount; i++) { tmp[idx++] = ProgramParam.TEXTURE_TYPE.mID; - tmp[idx++] = (int)mTextureTypes[i].mID; + tmp[idx++] = mTextureTypes[i].mID; texNames[i] = mTextureNames[i]; } diff --git a/rs/java/android/renderscript/ProgramFragmentFixedFunction.java b/rs/java/android/renderscript/ProgramFragmentFixedFunction.java index 22aed0a..2fe68be 100644 --- a/rs/java/android/renderscript/ProgramFragmentFixedFunction.java +++ b/rs/java/android/renderscript/ProgramFragmentFixedFunction.java @@ -52,25 +52,25 @@ public class ProgramFragmentFixedFunction extends ProgramFragment { */ public ProgramFragmentFixedFunction create() { mRS.validate(); - int[] tmp = new int[(mInputCount + mOutputCount + mConstantCount + mTextureCount) * 2]; + long[] tmp = new long[(mInputCount + mOutputCount + mConstantCount + mTextureCount) * 2]; String[] texNames = new String[mTextureCount]; int idx = 0; for (int i=0; i < mInputCount; i++) { tmp[idx++] = ProgramParam.INPUT.mID; - tmp[idx++] = (int)mInputs[i].getID(mRS); + tmp[idx++] = mInputs[i].getID(mRS); } for (int i=0; i < mOutputCount; i++) { tmp[idx++] = ProgramParam.OUTPUT.mID; - tmp[idx++] = (int)mOutputs[i].getID(mRS); + tmp[idx++] = mOutputs[i].getID(mRS); } for (int i=0; i < mConstantCount; i++) { tmp[idx++] = ProgramParam.CONSTANT.mID; - tmp[idx++] = (int)mConstants[i].getID(mRS); + tmp[idx++] = mConstants[i].getID(mRS); } for (int i=0; i < mTextureCount; i++) { tmp[idx++] = ProgramParam.TEXTURE_TYPE.mID; - tmp[idx++] = (int)mTextureTypes[i].mID; + tmp[idx++] = mTextureTypes[i].mID; texNames[i] = mTextureNames[i]; } diff --git a/rs/java/android/renderscript/ProgramVertex.java b/rs/java/android/renderscript/ProgramVertex.java index b6886e1..d3a51de 100644 --- a/rs/java/android/renderscript/ProgramVertex.java +++ b/rs/java/android/renderscript/ProgramVertex.java @@ -126,25 +126,25 @@ public class ProgramVertex extends Program { */ public ProgramVertex create() { mRS.validate(); - int[] tmp = new int[(mInputCount + mOutputCount + mConstantCount + mTextureCount) * 2]; + long[] tmp = new long[(mInputCount + mOutputCount + mConstantCount + mTextureCount) * 2]; String[] texNames = new String[mTextureCount]; int idx = 0; for (int i=0; i < mInputCount; i++) { tmp[idx++] = ProgramParam.INPUT.mID; - tmp[idx++] = (int)mInputs[i].getID(mRS); + tmp[idx++] = mInputs[i].getID(mRS); } for (int i=0; i < mOutputCount; i++) { tmp[idx++] = ProgramParam.OUTPUT.mID; - tmp[idx++] = (int)mOutputs[i].getID(mRS); + tmp[idx++] = mOutputs[i].getID(mRS); } for (int i=0; i < mConstantCount; i++) { tmp[idx++] = ProgramParam.CONSTANT.mID; - tmp[idx++] = (int)mConstants[i].getID(mRS); + tmp[idx++] = mConstants[i].getID(mRS); } for (int i=0; i < mTextureCount; i++) { tmp[idx++] = ProgramParam.TEXTURE_TYPE.mID; - tmp[idx++] = (int)mTextureTypes[i].mID; + tmp[idx++] = mTextureTypes[i].mID; texNames[i] = mTextureNames[i]; } diff --git a/rs/java/android/renderscript/ProgramVertexFixedFunction.java b/rs/java/android/renderscript/ProgramVertexFixedFunction.java index c479c77..a350154 100644 --- a/rs/java/android/renderscript/ProgramVertexFixedFunction.java +++ b/rs/java/android/renderscript/ProgramVertexFixedFunction.java @@ -79,25 +79,25 @@ public class ProgramVertexFixedFunction extends ProgramVertex { */ public ProgramVertexFixedFunction create() { mRS.validate(); - int[] tmp = new int[(mInputCount + mOutputCount + mConstantCount + mTextureCount) * 2]; + long[] tmp = new long[(mInputCount + mOutputCount + mConstantCount + mTextureCount) * 2]; String[] texNames = new String[mTextureCount]; int idx = 0; for (int i=0; i < mInputCount; i++) { tmp[idx++] = ProgramParam.INPUT.mID; - tmp[idx++] = (int)mInputs[i].getID(mRS); + tmp[idx++] = mInputs[i].getID(mRS); } for (int i=0; i < mOutputCount; i++) { tmp[idx++] = ProgramParam.OUTPUT.mID; - tmp[idx++] = (int)mOutputs[i].getID(mRS); + tmp[idx++] = mOutputs[i].getID(mRS); } for (int i=0; i < mConstantCount; i++) { tmp[idx++] = ProgramParam.CONSTANT.mID; - tmp[idx++] = (int)mConstants[i].getID(mRS); + tmp[idx++] = mConstants[i].getID(mRS); } for (int i=0; i < mTextureCount; i++) { tmp[idx++] = ProgramParam.TEXTURE_TYPE.mID; - tmp[idx++] = (int)mTextureTypes[i].mID; + tmp[idx++] = mTextureTypes[i].mID; texNames[i] = mTextureNames[i]; } diff --git a/rs/java/android/renderscript/RenderScript.java b/rs/java/android/renderscript/RenderScript.java index b211c5a..7db331f 100644 --- a/rs/java/android/renderscript/RenderScript.java +++ b/rs/java/android/renderscript/RenderScript.java @@ -307,8 +307,8 @@ public class RenderScript { validate(); return rsnElementCreate(mContext, type, kind, norm, vecSize); } - native long rsnElementCreate2(long con, int[]elements, String[] names, int[] arraySizes); - synchronized long nElementCreate2(int[] elements, String[] names, int[] arraySizes) { + native long rsnElementCreate2(long con, long[] elements, String[] names, int[] arraySizes); + synchronized long nElementCreate2(long[] elements, String[] names, int[] arraySizes) { validate(); return rsnElementCreate2(mContext, elements, names, arraySizes); } @@ -318,8 +318,8 @@ public class RenderScript { rsnElementGetNativeData(mContext, id, elementData); } native void rsnElementGetSubElements(long con, long id, - int[] IDs, String[] names, int[] arraySizes); - synchronized void nElementGetSubElements(long id, int[] IDs, String[] names, int[] arraySizes) { + long[] IDs, String[] names, int[] arraySizes); + synchronized void nElementGetSubElements(long id, long[] IDs, String[] names, int[] arraySizes) { validate(); rsnElementGetSubElements(mContext, id, IDs, names, arraySizes); } @@ -329,14 +329,14 @@ public class RenderScript { validate(); return rsnTypeCreate(mContext, eid, x, y, z, mips, faces, yuv); } - native void rsnTypeGetNativeData(long con, long id, int[] typeData); - synchronized void nTypeGetNativeData(long id, int[] typeData) { + native void rsnTypeGetNativeData(long con, long id, long[] typeData); + synchronized void nTypeGetNativeData(long id, long[] typeData) { validate(); rsnTypeGetNativeData(mContext, id, typeData); } - native long rsnAllocationCreateTyped(long con, long type, int mip, int usage, int pointer); - synchronized long nAllocationCreateTyped(long type, int mip, int usage, int pointer) { + native long rsnAllocationCreateTyped(long con, long type, int mip, int usage, long pointer); + synchronized long nAllocationCreateTyped(long type, int mip, int usage, long pointer) { validate(); return rsnAllocationCreateTyped(mContext, type, mip, usage, pointer); } @@ -704,8 +704,8 @@ public class RenderScript { return rsnScriptFieldIDCreate(mContext, sid, slot); } - 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) { + native long rsnScriptGroupCreate(long con, long[] kernels, long[] src, long[] dstk, long[] dstf, long[] types); + synchronized long nScriptGroupCreate(long[] kernels, long[] src, long[] dstk, long[] dstf, long[] types) { validate(); return rsnScriptGroupCreate(mContext, kernels, src, dstk, dstf, types); } @@ -768,19 +768,19 @@ public class RenderScript { validate(); rsnProgramBindSampler(mContext, vpf, slot, s); } - native long rsnProgramFragmentCreate(long con, String shader, String[] texNames, int[] params); - synchronized long nProgramFragmentCreate(String shader, String[] texNames, int[] params) { + native long rsnProgramFragmentCreate(long con, String shader, String[] texNames, long[] params); + synchronized long nProgramFragmentCreate(String shader, String[] texNames, long[] params) { validate(); return rsnProgramFragmentCreate(mContext, shader, texNames, params); } - native long rsnProgramVertexCreate(long con, String shader, String[] texNames, int[] params); - synchronized long nProgramVertexCreate(String shader, String[] texNames, int[] params) { + native long rsnProgramVertexCreate(long con, String shader, String[] texNames, long[] params); + synchronized long nProgramVertexCreate(String shader, String[] texNames, long[] params) { validate(); return rsnProgramVertexCreate(mContext, shader, texNames, params); } - native long rsnMeshCreate(long con, int[] vtx, int[] idx, int[] prim); - synchronized long nMeshCreate(int[] vtx, int[] idx, int[] prim) { + native long rsnMeshCreate(long con, long[] vtx, long[] idx, int[] prim); + synchronized long nMeshCreate(long[] vtx, long[] idx, int[] prim) { validate(); return rsnMeshCreate(mContext, vtx, idx, prim); } @@ -794,13 +794,13 @@ public class RenderScript { validate(); return rsnMeshGetIndexCount(mContext, id); } - native void rsnMeshGetVertices(long con, long id, int[] vtxIds, int vtxIdCount); - synchronized void nMeshGetVertices(long id, int[] vtxIds, int vtxIdCount) { + native void rsnMeshGetVertices(long con, long id, long[] vtxIds, int vtxIdCount); + synchronized void nMeshGetVertices(long id, long[] vtxIds, int vtxIdCount) { validate(); rsnMeshGetVertices(mContext, id, vtxIds, 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) { + native void rsnMeshGetIndices(long con, long id, long[] idxIds, int[] primitives, int vtxIdCount); + synchronized void nMeshGetIndices(long id, long[] idxIds, int[] primitives, int vtxIdCount) { validate(); rsnMeshGetIndices(mContext, id, idxIds, primitives, vtxIdCount); } diff --git a/rs/java/android/renderscript/ScriptGroup.java b/rs/java/android/renderscript/ScriptGroup.java index 48dba30..1200a66 100644 --- a/rs/java/android/renderscript/ScriptGroup.java +++ b/rs/java/android/renderscript/ScriptGroup.java @@ -380,7 +380,6 @@ 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"); @@ -395,13 +394,13 @@ public final class ScriptGroup extends BaseObj { ArrayList<IO> inputs = new ArrayList<IO>(); ArrayList<IO> outputs = new ArrayList<IO>(); - int[] kernels = new int[mKernelCount]; + long[] kernels = new long[mKernelCount]; int idx = 0; for (int ct=0; ct < mNodes.size(); ct++) { Node n = mNodes.get(ct); for (int ct2=0; ct2 < n.mKernels.size(); ct2++) { final Script.KernelID kid = n.mKernels.get(ct2); - kernels[idx++] = (int)kid.getID(mRS); + kernels[idx++] = kid.getID(mRS); boolean hasInput = false; boolean hasOutput = false; @@ -428,21 +427,21 @@ public final class ScriptGroup extends BaseObj { throw new RSRuntimeException("Count mismatch, should not happen."); } - int[] src = new int[mLines.size()]; - int[] dstk = new int[mLines.size()]; - int[] dstf = new int[mLines.size()]; - int[] types = new int[mLines.size()]; + long[] src = new long[mLines.size()]; + long[] dstk = new long[mLines.size()]; + long[] dstf = new long[mLines.size()]; + long[] types = new long[mLines.size()]; for (int ct=0; ct < mLines.size(); ct++) { ConnectLine cl = mLines.get(ct); - src[ct] = (int)cl.mFrom.getID(mRS); + src[ct] = cl.mFrom.getID(mRS); if (cl.mToK != null) { - dstk[ct] = (int)cl.mToK.getID(mRS); + dstk[ct] = cl.mToK.getID(mRS); } if (cl.mToF != null) { - dstf[ct] = (int)cl.mToF.getID(mRS); + dstf[ct] = cl.mToF.getID(mRS); } - types[ct] = (int)cl.mAllocationType.getID(mRS); + types[ct] = cl.mAllocationType.getID(mRS); } long id = mRS.nScriptGroupCreate(kernels, src, dstk, dstf, types); diff --git a/rs/java/android/renderscript/Type.java b/rs/java/android/renderscript/Type.java index 7bdd360..ce7f571 100644 --- a/rs/java/android/renderscript/Type.java +++ b/rs/java/android/renderscript/Type.java @@ -196,20 +196,18 @@ public class Type extends BaseObj { @Override void updateFromNative() { - // FIXME: rsaTypeGetNativeData needs 32-bit and 64-bit paths - - // We have 6 integer to obtain mDimX; mDimY; mDimZ; + // We have 6 integer/long to obtain mDimX; mDimY; mDimZ; // mDimLOD; mDimFaces; mElement; - int[] dataBuffer = new int[6]; - mRS.nTypeGetNativeData((int)getID(mRS), dataBuffer); + long[] dataBuffer = new long[6]; + mRS.nTypeGetNativeData(getID(mRS), dataBuffer); - mDimX = dataBuffer[0]; - mDimY = dataBuffer[1]; - mDimZ = dataBuffer[2]; + mDimX = (int)dataBuffer[0]; + mDimY = (int)dataBuffer[1]; + mDimZ = (int)dataBuffer[2]; mDimMipmaps = dataBuffer[3] == 1 ? true : false; mDimFaces = dataBuffer[4] == 1 ? true : false; - int elementID = dataBuffer[5]; + long elementID = dataBuffer[5]; if(elementID != 0) { mElement = new Element(elementID, mRS); mElement.updateFromNative(); diff --git a/rs/jni/android_renderscript_RenderScript.cpp b/rs/jni/android_renderscript_RenderScript.cpp index 80a5da2..a8f92ce 100644 --- a/rs/jni/android_renderscript_RenderScript.cpp +++ b/rs/jni/android_renderscript_RenderScript.cpp @@ -412,13 +412,21 @@ nElementCreate(JNIEnv *_env, jobject _this, jlong con, jlong type, jint kind, jb static jlong nElementCreate2(JNIEnv *_env, jobject _this, jlong con, - jintArray _ids, jobjectArray _names, jintArray _arraySizes) + jlongArray _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); + jlong *jIds = _env->GetLongArrayElements(_ids, NULL); + jint *jArraySizes = _env->GetIntArrayElements(_arraySizes, NULL); + + RsElement *ids = (RsElement*)malloc(fieldCount * sizeof(RsElement)); + uint32_t *arraySizes = (uint32_t *)malloc(fieldCount * sizeof(uint32_t)); + + for(int i = 0; i < fieldCount; i ++) { + ids[i] = (RsElement)jIds[i]; + arraySizes[i] = (uint32_t)jArraySizes[i]; + } AutoJavaStringArrayToUTF8 names(_env, _names, fieldCount); @@ -426,12 +434,15 @@ nElementCreate2(JNIEnv *_env, jobject _this, jlong con, size_t *sizeArray = names.c_str_len(); jlong id = (jlong)rsElementCreate2((RsContext)con, - (RsElement *)ids, fieldCount, + (const 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); + free(ids); + free(arraySizes); + _env->ReleaseLongArrayElements(_ids, jIds, JNI_ABORT); + _env->ReleaseIntArrayElements(_arraySizes, jArraySizes, JNI_ABORT); + return (jlong)id; } @@ -448,30 +459,33 @@ nElementGetNativeData(JNIEnv *_env, jobject _this, jlong con, jlong id, jintArra rsaElementGetNativeData((RsContext)con, (RsElement)id, elementData, dataSize); for(jint i = 0; i < dataSize; i ++) { - _env->SetIntArrayRegion(_elementData, i, 1, (const jint*)&elementData[i]); + const jint data = (jint)elementData[i]; + _env->SetIntArrayRegion(_elementData, i, 1, &data); } } static void nElementGetSubElements(JNIEnv *_env, jobject _this, jlong con, jlong id, - jintArray _IDs, + jlongArray _IDs, jobjectArray _names, jintArray _arraySizes) { - int dataSize = _env->GetArrayLength(_IDs); + uint32_t 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)); + uintptr_t *ids = (uintptr_t*)malloc(dataSize * sizeof(uintptr_t)); + const char **names = (const char **)malloc(dataSize * sizeof(const char *)); + size_t *arraySizes = (size_t *)malloc(dataSize * sizeof(size_t)); rsaElementGetSubElements((RsContext)con, (RsElement)id, ids, names, arraySizes, (uint32_t)dataSize); - for(jint i = 0; i < dataSize; i++) { + for(uint32_t i = 0; i < dataSize; i++) { + const jlong id = (jlong)ids[i]; + const jint arraySize = (jint)arraySizes[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]); + _env->SetLongArrayRegion(_IDs, i, 1, &id); + _env->SetIntArrayRegion(_arraySizes, i, 1, &arraySize); } free(ids); @@ -492,7 +506,7 @@ nTypeCreate(JNIEnv *_env, jobject _this, jlong con, jlong eid, } static void -nTypeGetNativeData(JNIEnv *_env, jobject _this, jlong con, jlong id, jintArray _typeData) +nTypeGetNativeData(JNIEnv *_env, jobject _this, jlong con, jlong id, jlongArray _typeData) { // We are packing 6 items: mDimX; mDimY; mDimZ; // mDimLOD; mDimFaces; mElement; into typeData @@ -501,21 +515,22 @@ nTypeGetNativeData(JNIEnv *_env, jobject _this, jlong con, jlong id, jintArray _ assert(elementCount == 6); LOG_API("nTypeGetNativeData, con(%p)", (RsContext)con); - uint32_t typeData[6]; + uintptr_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]); + const jlong data = (jlong)typeData[i]; + _env->SetLongArrayRegion(_typeData, i, 1, &data); } } // ----------------------------------- static jlong -nAllocationCreateTyped(JNIEnv *_env, jobject _this, jlong con, jlong type, jint mips, jint usage, jint pointer) +nAllocationCreateTyped(JNIEnv *_env, jobject _this, jlong con, jlong type, jint mips, jint usage, jlong 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); + return (jlong) rsAllocationCreateTyped((RsContext)con, (RsType)type, (RsAllocationMipmapControl)mips, (uint32_t)usage, (uintptr_t)pointer); } static void @@ -601,7 +616,7 @@ nAllocationCreateBitmapBackedAllocation(JNIEnv *_env, jobject _this, jlong con, const void* ptr = bitmap.getPixels(); jlong id = (jlong)rsAllocationCreateTyped((RsContext)con, (RsType)type, (RsAllocationMipmapControl)mip, - (uint32_t)usage, (size_t)ptr); + (uint32_t)usage, (uintptr_t)ptr); bitmap.unlockPixels(); return id; } @@ -1196,34 +1211,63 @@ nScriptFieldIDCreate(JNIEnv *_env, jobject _this, jlong con, jlong sid, jint slo } static jlong -nScriptGroupCreate(JNIEnv *_env, jobject _this, jlong con, jintArray _kernels, jintArray _src, - jintArray _dstk, jintArray _dstf, jintArray _types) +nScriptGroupCreate(JNIEnv *_env, jobject _this, jlong con, jlongArray _kernels, jlongArray _src, + jlongArray _dstk, jlongArray _dstf, jlongArray _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); + jint kernelsLen = _env->GetArrayLength(_kernels); + jlong *jKernelsPtr = _env->GetLongArrayElements(_kernels, NULL); + RsScriptKernelID* kernelsPtr = (RsScriptKernelID*) malloc(sizeof(RsScriptKernelID) * kernelsLen); + for(int i = 0; i < kernelsLen; ++i) { + kernelsPtr[i] = (RsScriptKernelID)jKernelsPtr[i]; + } + + jint srcLen = _env->GetArrayLength(_src); + jlong *jSrcPtr = _env->GetLongArrayElements(_src, NULL); + RsScriptKernelID* srcPtr = (RsScriptKernelID*) malloc(sizeof(RsScriptKernelID) * srcLen); + for(int i = 0; i < srcLen; ++i) { + srcPtr[i] = (RsScriptKernelID)jSrcPtr[i]; + } + + jint dstkLen = _env->GetArrayLength(_dstk); + jlong *jDstkPtr = _env->GetLongArrayElements(_dstk, NULL); + RsScriptKernelID* dstkPtr = (RsScriptKernelID*) malloc(sizeof(RsScriptKernelID) * dstkLen); + for(int i = 0; i < dstkLen; ++i) { + dstkPtr[i] = (RsScriptKernelID)jDstkPtr[i]; + } + + jint dstfLen = _env->GetArrayLength(_dstf); + jlong *jDstfPtr = _env->GetLongArrayElements(_dstf, NULL); + RsScriptKernelID* dstfPtr = (RsScriptKernelID*) malloc(sizeof(RsScriptKernelID) * dstfLen); + for(int i = 0; i < dstfLen; ++i) { + dstfPtr[i] = (RsScriptKernelID)jDstfPtr[i]; + } + + jint typesLen = _env->GetArrayLength(_types); + jlong *jTypesPtr = _env->GetLongArrayElements(_types, NULL); + RsType* typesPtr = (RsType*) malloc(sizeof(RsType) * typesLen); + for(int i = 0; i < typesLen; ++i) { + typesPtr[i] = (RsType)jTypesPtr[i]; + } + + jlong id = (jlong)rsScriptGroupCreate((RsContext)con, + (RsScriptKernelID *)kernelsPtr, kernelsLen * sizeof(RsScriptKernelID), + (RsScriptKernelID *)srcPtr, srcLen * sizeof(RsScriptKernelID), + (RsScriptKernelID *)dstkPtr, dstkLen * sizeof(RsScriptKernelID), + (RsScriptFieldID *)dstfPtr, dstfLen * sizeof(RsScriptKernelID), + (RsType *)typesPtr, typesLen * sizeof(RsType)); + + free(kernelsPtr); + free(srcPtr); + free(dstkPtr); + free(dstfPtr); + free(typesPtr); + _env->ReleaseLongArrayElements(_kernels, jKernelsPtr, 0); + _env->ReleaseLongArrayElements(_src, jSrcPtr, 0); + _env->ReleaseLongArrayElements(_dstk, jDstkPtr, 0); + _env->ReleaseLongArrayElements(_dstf, jDstfPtr, 0); + _env->ReleaseLongArrayElements(_types, jTypesPtr, 0); return id; } @@ -1292,10 +1336,10 @@ nProgramBindSampler(JNIEnv *_env, jobject _this, jlong con, jlong vpf, jint slot static jlong nProgramFragmentCreate(JNIEnv *_env, jobject _this, jlong con, jstring shader, - jobjectArray texNames, jintArray params) + jobjectArray texNames, jlongArray params) { AutoJavaStringToUTF8 shaderUTF(_env, shader); - jint *paramPtr = _env->GetIntArrayElements(params, NULL); + jlong *jParamPtr = _env->GetLongArrayElements(params, NULL); jint paramLen = _env->GetArrayLength(params); int texCount = _env->GetArrayLength(texNames); @@ -1305,11 +1349,16 @@ nProgramFragmentCreate(JNIEnv *_env, jobject _this, jlong con, jstring shader, LOG_API("nProgramFragmentCreate, con(%p), paramLen(%i)", (RsContext)con, paramLen); + uintptr_t * paramPtr = (uintptr_t*) malloc(sizeof(uintptr_t) * paramLen); + for(int i = 0; i < paramLen; ++i) { + paramPtr[i] = (uintptr_t)jParamPtr[i]; + } jlong ret = (jlong)rsProgramFragmentCreate((RsContext)con, shaderUTF.c_str(), shaderUTF.length(), nameArray, texCount, sizeArray, - (uint32_t *)paramPtr, paramLen); + paramPtr, paramLen); - _env->ReleaseIntArrayElements(params, paramPtr, JNI_ABORT); + free(paramPtr); + _env->ReleaseLongArrayElements(params, jParamPtr, JNI_ABORT); return ret; } @@ -1318,10 +1367,10 @@ nProgramFragmentCreate(JNIEnv *_env, jobject _this, jlong con, jstring shader, static jlong nProgramVertexCreate(JNIEnv *_env, jobject _this, jlong con, jstring shader, - jobjectArray texNames, jintArray params) + jobjectArray texNames, jlongArray params) { AutoJavaStringToUTF8 shaderUTF(_env, shader); - jint *paramPtr = _env->GetIntArrayElements(params, NULL); + jlong *jParamPtr = _env->GetLongArrayElements(params, NULL); jint paramLen = _env->GetArrayLength(params); LOG_API("nProgramVertexCreate, con(%p), paramLen(%i)", (RsContext)con, paramLen); @@ -1331,11 +1380,17 @@ nProgramVertexCreate(JNIEnv *_env, jobject _this, jlong con, jstring shader, const char ** nameArray = names.c_str(); size_t* sizeArray = names.c_str_len(); + uintptr_t * paramPtr = (uintptr_t*) malloc(sizeof(uintptr_t) * paramLen); + for(int i = 0; i < paramLen; ++i) { + paramPtr[i] = (uintptr_t)jParamPtr[i]; + } + jlong ret = (jlong)rsProgramVertexCreate((RsContext)con, shaderUTF.c_str(), shaderUTF.length(), nameArray, texCount, sizeArray, - (uint32_t *)paramPtr, paramLen); + paramPtr, paramLen); - _env->ReleaseIntArrayElements(params, paramPtr, JNI_ABORT); + free(paramPtr); + _env->ReleaseLongArrayElements(params, jParamPtr, JNI_ABORT); return ret; } @@ -1416,24 +1471,36 @@ nPathCreate(JNIEnv *_env, jobject _this, jlong con, jint prim, jboolean isStatic } static jlong -nMeshCreate(JNIEnv *_env, jobject _this, jlong con, jintArray _vtx, jintArray _idx, jintArray _prim) +nMeshCreate(JNIEnv *_env, jobject _this, jlong con, jlongArray _vtx, jlongArray _idx, jintArray _prim) { LOG_API("nMeshCreate, con(%p)", (RsContext)con); jint vtxLen = _env->GetArrayLength(_vtx); - jint *vtxPtr = _env->GetIntArrayElements(_vtx, NULL); + jlong *jVtxPtr = _env->GetLongArrayElements(_vtx, NULL); + RsAllocation* vtxPtr = (RsAllocation*) malloc(sizeof(RsAllocation) * vtxLen); + for(int i = 0; i < vtxLen; ++i) { + vtxPtr[i] = (RsAllocation)(uintptr_t)jVtxPtr[i]; + } + jint idxLen = _env->GetArrayLength(_idx); - jint *idxPtr = _env->GetIntArrayElements(_idx, NULL); + jlong *jIdxPtr = _env->GetLongArrayElements(_idx, NULL); + RsAllocation* idxPtr = (RsAllocation*) malloc(sizeof(RsAllocation) * idxLen); + for(int i = 0; i < idxLen; ++i) { + idxPtr[i] = (RsAllocation)(uintptr_t)jIdxPtr[i]; + } + jint primLen = _env->GetArrayLength(_prim); jint *primPtr = _env->GetIntArrayElements(_prim, NULL); - int id = (int)rsMeshCreate((RsContext)con, + jlong id = (jlong)rsMeshCreate((RsContext)con, (RsAllocation *)vtxPtr, vtxLen, (RsAllocation *)idxPtr, idxLen, (uint32_t *)primPtr, primLen); - _env->ReleaseIntArrayElements(_vtx, vtxPtr, 0); - _env->ReleaseIntArrayElements(_idx, idxPtr, 0); + free(vtxPtr); + free(idxPtr); + _env->ReleaseLongArrayElements(_vtx, jVtxPtr, 0); + _env->ReleaseLongArrayElements(_idx, jIdxPtr, 0); _env->ReleaseIntArrayElements(_prim, primPtr, 0); return id; } @@ -1457,7 +1524,7 @@ nMeshGetIndexCount(JNIEnv *_env, jobject _this, jlong con, jlong mesh) } static void -nMeshGetVertices(JNIEnv *_env, jobject _this, jlong con, jlong mesh, jintArray _ids, int numVtxIDs) +nMeshGetVertices(JNIEnv *_env, jobject _this, jlong con, jlong mesh, jlongArray _ids, jint numVtxIDs) { LOG_API("nMeshGetVertices, con(%p), Mesh(%p)", (RsContext)con, (RsMesh)mesh); @@ -1465,14 +1532,15 @@ nMeshGetVertices(JNIEnv *_env, jobject _this, jlong con, jlong mesh, jintArray _ 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]); + const jlong alloc = (jlong)allocs[i]; + _env->SetLongArrayRegion(_ids, i, 1, &alloc); } free(allocs); } static void -nMeshGetIndices(JNIEnv *_env, jobject _this, jlong con, jlong mesh, jintArray _idxIds, jintArray _primitives, int numIndices) +nMeshGetIndices(JNIEnv *_env, jobject _this, jlong con, jlong mesh, jlongArray _idxIds, jintArray _primitives, jint numIndices) { LOG_API("nMeshGetVertices, con(%p), Mesh(%p)", (RsContext)con, (RsMesh)mesh); @@ -1482,8 +1550,10 @@ nMeshGetIndices(JNIEnv *_env, jobject _this, jlong con, jlong mesh, jintArray _i 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]); + const jlong alloc = (jlong)allocs[i]; + const jint prim = (jint)prims[i]; + _env->SetLongArrayRegion(_idxIds, i, 1, &alloc); + _env->SetIntArrayRegion(_primitives, i, 1, &prim); } free(allocs); @@ -1536,14 +1606,14 @@ static JNINativeMethod methods[] = { {"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 }, +{"rsnElementCreate2", "(J[J[Ljava/lang/String;[I)J", (void*)nElementCreate2 }, {"rsnElementGetNativeData", "(JJ[I)V", (void*)nElementGetNativeData }, -{"rsnElementGetSubElements", "(JJ[I[Ljava/lang/String;[I)V", (void*)nElementGetSubElements }, +{"rsnElementGetSubElements", "(JJ[J[Ljava/lang/String;[I)V", (void*)nElementGetSubElements }, {"rsnTypeCreate", "(JJIIIZZI)J", (void*)nTypeCreate }, -{"rsnTypeGetNativeData", "(JJ[I)V", (void*)nTypeGetNativeData }, +{"rsnTypeGetNativeData", "(JJ[J)V", (void*)nTypeGetNativeData }, -{"rsnAllocationCreateTyped", "(JJIII)J", (void*)nAllocationCreateTyped }, +{"rsnAllocationCreateTyped", "(JJIIJ)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 }, @@ -1594,7 +1664,7 @@ static JNINativeMethod methods[] = { {"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 }, +{"rsnScriptGroupCreate", "(J[J[J[J[J[J)J", (void*)nScriptGroupCreate }, {"rsnScriptGroupSetInput", "(JJJJ)V", (void*)nScriptGroupSetInput }, {"rsnScriptGroupSetOutput", "(JJJJ)V", (void*)nScriptGroupSetOutput }, {"rsnScriptGroupExecute", "(JJ)V", (void*)nScriptGroupExecute }, @@ -1605,9 +1675,9 @@ static JNINativeMethod methods[] = { {"rsnProgramBindTexture", "(JJIJ)V", (void*)nProgramBindTexture }, {"rsnProgramBindSampler", "(JJIJ)V", (void*)nProgramBindSampler }, -{"rsnProgramFragmentCreate", "(JLjava/lang/String;[Ljava/lang/String;[I)J", (void*)nProgramFragmentCreate }, +{"rsnProgramFragmentCreate", "(JLjava/lang/String;[Ljava/lang/String;[J)J", (void*)nProgramFragmentCreate }, {"rsnProgramRasterCreate", "(JZI)J", (void*)nProgramRasterCreate }, -{"rsnProgramVertexCreate", "(JLjava/lang/String;[Ljava/lang/String;[I)J", (void*)nProgramVertexCreate }, +{"rsnProgramVertexCreate", "(JLjava/lang/String;[Ljava/lang/String;[J)J", (void*)nProgramVertexCreate }, {"rsnContextBindRootScript", "(JI)V", (void*)nContextBindRootScript }, {"rsnContextBindProgramStore", "(JI)V", (void*)nContextBindProgramStore }, @@ -1618,12 +1688,12 @@ static JNINativeMethod methods[] = { {"rsnSamplerCreate", "(JIIIIIF)J", (void*)nSamplerCreate }, {"rsnPathCreate", "(JIZJJF)J", (void*)nPathCreate }, -{"rsnMeshCreate", "(J[I[I[I)J", (void*)nMeshCreate }, +{"rsnMeshCreate", "(J[J[J[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 }, +{"rsnMeshGetVertices", "(JJ[JI)V", (void*)nMeshGetVertices }, +{"rsnMeshGetIndices", "(JJ[J[II)V", (void*)nMeshGetIndices }, }; diff --git a/services/java/com/android/server/pm/PackageManagerService.java b/services/java/com/android/server/pm/PackageManagerService.java index 74a66d6..d8b4f1a 100755 --- a/services/java/com/android/server/pm/PackageManagerService.java +++ b/services/java/com/android/server/pm/PackageManagerService.java @@ -3674,6 +3674,7 @@ public class PackageManagerService extends IPackageManager.Stub { updatedPkg = mSettings.getDisabledSystemPkgLPr(ps != null ? ps.name : pkg.packageName); if (DEBUG_INSTALL && updatedPkg != null) Slog.d(TAG, "updatedPkg = " + updatedPkg); } + boolean updatedPkgBetter = false; // First check if this is a system package that may involve an update if (updatedPkg != null && (parseFlags&PackageParser.PARSE_IS_SYSTEM) != 0) { if (ps != null && !ps.codePath.equals(scanFile)) { @@ -3728,6 +3729,7 @@ public class PackageManagerService extends IPackageManager.Stub { synchronized (mPackages) { mSettings.enableSystemPackageLPw(ps.name); } + updatedPkgBetter = true; } } } @@ -3804,7 +3806,7 @@ public class PackageManagerService extends IPackageManager.Stub { String codePath = null; String resPath = null; - if ((parseFlags & PackageParser.PARSE_FORWARD_LOCK) != 0) { + if ((parseFlags & PackageParser.PARSE_FORWARD_LOCK) != 0 && !updatedPkgBetter) { if (ps != null && ps.resourcePathString != null) { resPath = ps.resourcePathString; } else { diff --git a/services/java/com/android/server/wm/WindowManagerService.java b/services/java/com/android/server/wm/WindowManagerService.java index 6d47fcf..5da3e3e 100644 --- a/services/java/com/android/server/wm/WindowManagerService.java +++ b/services/java/com/android/server/wm/WindowManagerService.java @@ -3480,8 +3480,9 @@ public class WindowManagerService extends IWindowManager.Stub Task newTask = mTaskIdToTask.get(groupId); if (newTask == null) { newTask = createTask(groupId, oldTask.mStack.mStackId, oldTask.mUserId, atoken); + } else { + newTask.mAppTokens.add(atoken); } - newTask.mAppTokens.add(atoken); } } diff --git a/tools/layoutlib/bridge/src/android/os/SystemClock_Delegate.java b/tools/layoutlib/bridge/src/android/os/SystemClock_Delegate.java index fd594f7..5f0d98b 100644 --- a/tools/layoutlib/bridge/src/android/os/SystemClock_Delegate.java +++ b/tools/layoutlib/bridge/src/android/os/SystemClock_Delegate.java @@ -33,11 +33,6 @@ public class SystemClock_Delegate { private static long sBootTime = System.currentTimeMillis(); private static long sBootTimeNano = System.nanoTime(); - @LayoutlibDelegate - /*package*/ static boolean setCurrentTimeMillis(long millis) { - return true; - } - /** * Returns milliseconds since boot, not counting time spent in deep sleep. * <b>Note:</b> This value may get reset occasionally (before it would diff --git a/tools/preload/Android.mk b/tools/preload/Android.mk index f325870..14a4547 100644 --- a/tools/preload/Android.mk +++ b/tools/preload/Android.mk @@ -20,4 +20,4 @@ LOCAL_MODULE:= preload include $(BUILD_HOST_JAVA_LIBRARY) -include $(call all-subdir-makefiles) +include $(call all-makefiles-under,$(LOCAL_PATH)) |