Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Kenny Root
2011-01-20 13:27:35 -08:00
committed by Android (Google) Code Review
parent 2ca4d8b7b9 7fbe4d2e74
commit 6af08a47d0
1 changed files with 1 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/jni/android_util_AssetManager.cpp
View File

@@ -1111,6 +1111,7 @@ static jboolean android_content_AssetManager_applyStyle(JNIEnv* env, jobject cla
if (value.dataType == Res_value::TYPE_REFERENCE && value.data == 0) { if (value.dataType == Res_value::TYPE_REFERENCE && value.data == 0) {
DEBUG_STYLES(LOGI("-> Setting to @null!")); DEBUG_STYLES(LOGI("-> Setting to @null!"));
value.dataType = Res_value::TYPE_NULL; value.dataType = Res_value::TYPE_NULL;
block = kXmlBlock;
} }
DEBUG_STYLES(LOGI("Attribute 0x%08x: type=0x%x, data=0x%08x", DEBUG_STYLES(LOGI("Attribute 0x%08x: type=0x%x, data=0x%08x",