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

Commit 6af08a47 authored by Kenny Root's avatar Kenny Root Committed by Android (Google) Code Review
Browse files

Merge "Don't pay attention to string block on @null" into honeycomb

parents 2ca4d8b7 7fbe4d2e

core/jni/android_util_AssetManager.cpp

+1 −0
Original line number Diff line number Diff line
@@ -1111,6 +1111,7 @@ static jboolean android_content_AssetManager_applyStyle(JNIEnv* env, jobject cla 
        if (value.dataType == Res_value::TYPE_REFERENCE && value.data == 0) {

            DEBUG_STYLES(LOGI("-> Setting to @null!"));

            value.dataType = Res_value::TYPE_NULL;

            block = kXmlBlock;

        }



        DEBUG_STYLES(LOGI("Attribute 0x%08x: type=0x%x, data=0x%08x",