diff options
| author | 2011-01-20 13:27:35 -0800 | |
|---|---|---|
| committer | 2011-01-20 13:27:35 -0800 | |
| commit | 6af08a47d02ef75e18d226b93a0b553396cb6842 (patch) | |
| tree | 44284af64e42a066b2728c501b90eefc9f92f44b | |
| parent | 2ca4d8b7b97f20c8ad6897fc8c0c95616c0e80c6 (diff) | |
| parent | 7fbe4d2e7445ad4db07a42c74fe2934af46d1c7f (diff) | |
Merge "Don't pay attention to string block on @null" into honeycomb
| -rw-r--r-- | core/jni/android_util_AssetManager.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/core/jni/android_util_AssetManager.cpp b/core/jni/android_util_AssetManager.cpp index 619a29395675..1bce332d6127 100644 --- 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", |