Merge "Fix issue #8176917: Stabillity : Native Crash :"

2 files changed, 8 insertions, 0 deletions

diff --git a/core/java/android/content/res/Resources.java b/core/java/android/content/res/Resources.java
index 777529394045..24a0bb532a8a 100644
--- a/core/java/android/content/res/Resources.java
+++ b/core/java/android/content/res/Resources.java
@@ -792,6 +792,7 @@ public class Resources {
                     "Resource ID #0x" + Integer.toHexString(id) + " type #0x"
                     + Integer.toHexString(value.type) + " is not valid");
             }
+            mTmpValue = null;
         }
         ColorStateList csl = loadColorStateList(value, id);
         synchronized (mAccessLock) {
@@ -2227,6 +2228,9 @@ public class Resources {
             throws NotFoundException {
         synchronized (mAccessLock) {
             TypedValue value = mTmpValue;
+            if (value == null) {
+                mTmpValue = value = new TypedValue();
+            }
             getValue(id, value, true);
             if (value.type == TypedValue.TYPE_STRING) {
                 return loadXmlResourceParser(value.string.toString(), id,
diff --git a/core/jni/android_util_AssetManager.cpp b/core/jni/android_util_AssetManager.cpp
index d422951039e8..8a8b15fb9bbf 100644
--- a/core/jni/android_util_AssetManager.cpp
+++ b/core/jni/android_util_AssetManager.cpp
@@ -685,6 +685,10 @@ static jint android_content_AssetManager_loadResourceValue(JNIEnv* env, jobject
                                                            jobject outValue,
                                                            jboolean resolve)
 {
+    if (outValue == null) {
+         jniThrowNullPointerException(env, "outValue");
+         return null;
+    }
     AssetManager* am = assetManagerForJavaObject(env, clazz);
     if (am == NULL) {
         return 0;