diff options
author | Adam Lesinski <adamlesinski@google.com> | 2014-10-01 00:39:56 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-10-01 00:39:57 +0000 |
commit | cd8e73817d14798f9d2031ffd301a03a096b7907 (patch) | |
tree | cb5717f76db1963c984c11eac74a0e9f63fec36c /core | |
parent | c2379e005d3e692d0b725c65fa842459e65ad1dc (diff) | |
parent | 5069dd69898bd0d9c69ba2bbd37239ec8d1c9dc6 (diff) | |
download | frameworks_base-cd8e73817d14798f9d2031ffd301a03a096b7907.zip frameworks_base-cd8e73817d14798f9d2031ffd301a03a096b7907.tar.gz frameworks_base-cd8e73817d14798f9d2031ffd301a03a096b7907.tar.bz2 |
Merge "Fix issue with using locally defined attrs in a shared lib" into lmp-dev
Diffstat (limited to 'core')
-rw-r--r-- | core/jni/android_util_AssetManager.cpp | 27 |
1 files changed, 23 insertions, 4 deletions
diff --git a/core/jni/android_util_AssetManager.cpp b/core/jni/android_util_AssetManager.cpp index 4859ee6..8753660 100644 --- a/core/jni/android_util_AssetManager.cpp +++ b/core/jni/android_util_AssetManager.cpp @@ -1324,7 +1324,21 @@ static jboolean android_content_AssetManager_applyStyle(JNIEnv* env, jobject cla config.density = 0; // Skip through XML attributes until the end or the next possible match. - while (ix < NX && curIdent > curXmlAttr) { + // We make two assumptions about the order of attributes: + // 1) Among attributes with the same package ID, the attributes are + // sorted by increasing resource ID. + // 2) Groups of attributes with the same package ID are in the same + // order. + // 3) The same sorting is applied to the input attributes as is + // to the attributes in the XML. + // + // ex: 02010000, 02010001, 010100f4, 010100f5 + // + // The total order of attributes (including package ID) can not be linear + // as shared libraries get assigned dynamic package IDs at runtime, which + // may break the sort order established at build time. + while (ix < NX && (Res_GETPACKAGE(curIdent) != Res_GETPACKAGE(curXmlAttr) || + curIdent > curXmlAttr)) { ix++; curXmlAttr = xmlParser->getAttributeNameResID(ix); } @@ -1339,7 +1353,9 @@ static jboolean android_content_AssetManager_applyStyle(JNIEnv* env, jobject cla } // Skip through the style values until the end or the next possible match. - while (styleEnt < endStyleEnt && curIdent > styleEnt->map.name.ident) { + while (styleEnt < endStyleEnt && + (Res_GETPACKAGE(curIdent) != Res_GETPACKAGE(styleEnt->map.name.ident) || + curIdent > styleEnt->map.name.ident)) { styleEnt++; } // Retrieve the current style attribute if it matches, and step to next. @@ -1355,7 +1371,9 @@ static jboolean android_content_AssetManager_applyStyle(JNIEnv* env, jobject cla } // Skip through the default style values until the end or the next possible match. - while (defStyleEnt < endDefStyleEnt && curIdent > defStyleEnt->map.name.ident) { + while (defStyleEnt < endDefStyleEnt && + (Res_GETPACKAGE(curIdent) != Res_GETPACKAGE(defStyleEnt->map.name.ident) || + curIdent > defStyleEnt->map.name.ident)) { defStyleEnt++; } // Retrieve the current default style attribute if it matches, and step to next. @@ -1517,7 +1535,8 @@ static jboolean android_content_AssetManager_retrieveAttributes(JNIEnv* env, job config.density = 0; // Skip through XML attributes until the end or the next possible match. - while (ix < NX && curIdent > curXmlAttr) { + while (ix < NX && (Res_GETPACKAGE(curIdent) != Res_GETPACKAGE(curXmlAttr) || + curIdent > curXmlAttr)) { ix++; curXmlAttr = xmlParser->getAttributeNameResID(ix); } |