Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 681533e0 authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android (Google) Code Review
Browse files

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

parents 1d3079cb e5b50a65

core/java/android/content/res/Resources.java

+4 −0
Original line number Diff line number Diff line
@@ -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,

core/jni/android_util_AssetManager.cpp

+4 −0
Original line number Diff line number Diff line
@@ -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;