From: Carl Shapiro <cshapiro@google.com>
Date: Wed, 20 Apr 2011 15:24:59 +0000 (-0700)
Subject: am 6892cab9: am e4195e1c: Fix a type error in the allocation of non-moving arrays.
X-Git-Tag: android-x86-4.0-r1~133
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=4dd60e2c;p=android-x86%2Fdalvik.git

am 6892cab9: am e4195e1c: Fix a type error in the allocation of non-moving arrays.

* commit '6892cab90362639344373ce6d71c8fdd9903ae22':
  Fix a type error in the allocation of non-moving arrays.
---

4dd60e2c7f9551a3d027fefd2cac5eb3dce9f844
diff --cc vm/native/dalvik_system_VMRuntime.c
index 3642f9098,eb086a8a6..55b028307
--- a/vm/native/dalvik_system_VMRuntime.c
+++ b/vm/native/dalvik_system_VMRuntime.c
@@@ -98,10 -128,9 +98,9 @@@ static void Dalvik_dalvik_system_VMRunt
  {
      ClassObject* elementClass = (ClassObject*) args[1];
      int length = args[2];
-     ArrayObject* newArray;
  
      if (elementClass == NULL) {
 -        dvmThrowException("Ljava/lang/NullPointerException;", NULL);
 +        dvmThrowNullPointerException(NULL);
          RETURN_VOID();
      }
      if (length < 0) {