1 files changed, 16 insertions, 6 deletions
diff --git a/vm/native/dalvik_system_VMRuntime.cpp b/vm/native/dalvik_system_VMRuntime.cpp
index 4123426d8..b5cbe4883 100644
--- a/vm/native/dalvik_system_VMRuntime.cpp
+++ b/vm/native/dalvik_system_VMRuntime.cpp
@@ -104,11 +104,11 @@ static void Dalvik_dalvik_system_VMRuntime_newNonMovableArray(const u4* args,
 
     if (elementClass == NULL) {
         dvmThrowNullPointerException("elementClass == null");
-        RETURN_VOID();
+        RETURN_PTR(NULL);
     }
     if (length < 0) {
         dvmThrowNegativeArraySizeException(length);
-        RETURN_VOID();
+        RETURN_PTR(NULL);
     }
 
     // TODO: right now, we don't have a copying collector, so there's no need
@@ -120,7 +120,7 @@ static void Dalvik_dalvik_system_VMRuntime_newNonMovableArray(const u4* args,
                                                  ALLOC_NON_MOVING);
     if (newArray == NULL) {
         assert(dvmCheckException(dvmThreadSelf()));
-        RETURN_VOID();
+        RETURN_PTR(NULL);
     }
     dvmReleaseTrackedAlloc((Object*) newArray, NULL);
 
@@ -195,7 +195,8 @@ static void Dalvik_dalvik_system_VMRuntime_vmLibrary(const u4* args,
     returnCString(pResult, "libdvm.so");
 }
 
-static void Dalvik_dalvik_system_VMRuntime_setTargetSdkVersion(const u4* args,
+static void Dalvik_dalvik_system_VMRuntime_setTargetSdkVersionNative(
+    const u4* args,
     JValue* pResult)
 {
     // This is the target SDK version of the app we're about to run.
@@ -238,6 +239,13 @@ static void Dalvik_dalvik_system_VMRuntime_registerNativeFree(const u4* args,
   RETURN_VOID();
 }
 
+static void Dalvik_dalvik_system_VMRuntime_updateProcessState(const u4* args,
+                                                              JValue* pResult)
+{
+  RETURN_VOID();
+}
+
+
 static DvmDex* getDvmDexFromClassPathEntry(ClassPathEntry* cpe) {
     if (cpe->kind == kCpeDex) {
         return ((RawDexFile*) cpe->ptr)->pDvmDex;
@@ -568,8 +576,8 @@ const DalvikNativeMethod dvm_dalvik_system_VMRuntime[] = {
         Dalvik_dalvik_system_VMRuntime_newNonMovableArray },
     { "properties", "()[Ljava/lang/String;",
         Dalvik_dalvik_system_VMRuntime_properties },
-    { "setTargetSdkVersion", "(I)V",
-        Dalvik_dalvik_system_VMRuntime_setTargetSdkVersion },
+    { "setTargetSdkVersionNative", "(I)V",
+        Dalvik_dalvik_system_VMRuntime_setTargetSdkVersionNative },
     { "startJitCompilation", "()V",
         Dalvik_dalvik_system_VMRuntime_startJitCompilation },
     { "vmVersion", "()Ljava/lang/String;",
@@ -580,6 +588,8 @@ const DalvikNativeMethod dvm_dalvik_system_VMRuntime[] = {
         Dalvik_dalvik_system_VMRuntime_registerNativeAllocation },
     { "registerNativeFree", "(I)V",
         Dalvik_dalvik_system_VMRuntime_registerNativeFree },
+    { "updateProcessState", "(I)V",
+        Dalvik_dalvik_system_VMRuntime_updateProcessState },
     { "preloadDexCaches", "()V",
         Dalvik_dalvik_system_VMRuntime_preloadDexCaches },
     { NULL, NULL, NULL },