am 6af08a47: Merge "Don\'t pay attention to string block on @null" into honeycomb

* commit '6af08a47d02ef75e18d226b93a0b553396cb6842': Don't pay attention to string block on @null
2011-01-20 17:05:18 -08:00
parent fa7469cae8 6af08a47d0
commit cb95ebcecf
1 changed files with 1 additions and 0 deletions
--- a/core/jni/android_util_AssetManager.cpp
+++ b/core/jni/android_util_AssetManager.cpp
@@ -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",