[Fix] Work around android manifest not found on LG devices.

zhanghai · Sep 15, 2023 · b6773ec · b6773ec
1 parent 1ed7316
commit b6773ec
Showing 1 changed file with 40 additions and 25 deletions.
diff --git a/app/src/main/java/me/zhanghai/android/files/compat/LocaleConfigCompat.kt b/app/src/main/java/me/zhanghai/android/files/compat/LocaleConfigCompat.kt
@@ -97,34 +97,49 @@ class LocaleConfigCompat(context: Context) {
                 } catch (e: FileNotFoundException) {
                     break
                 }
-                parser.use {
-                    do {
-                        if (parser.eventType != XmlPullParser.START_TAG) {
-                            continue
-                        }
-                        if (parser.name != TAG_MANIFEST) {
-                            parser.skipCurrentTag()
-                            continue
-                        }
-                        if (parser.getAttributeValue(null, ATTR_PACKAGE) != context.packageName) {
-                            break
-                        }
-                        while (parser.next() != XmlPullParser.END_TAG) {
-                            if (parser.eventType != XmlPullParser.START_TAG) {
-                                continue
-                            }
-                            if (parser.name != TAG_APPLICATION) {
-                                parser.skipCurrentTag()
-                                continue
-                            }
-                            return parser.getAttributeResourceValue(
-                                NAMESPACE_ANDROID, ATTR_LOCALE_CONFIG, ResourcesCompat.ID_NULL
-                            )
-                        }
-                    } while (parser.next() != XmlPullParser.END_DOCUMENT)
+                val resourceId = parser.use {
+                    getLocaleConfigResourceId(parser, context.packageName)
+                }
+                if (resourceId != ResourcesCompat.ID_NULL) {
+                    return resourceId
                 }
                 ++cookie
             }
+            val parser = try {
+                context.assets.openXmlResourceParser(FILE_NAME_ANDROID_MANIFEST)
+            } catch (e: FileNotFoundException) {
+                return ResourcesCompat.ID_NULL
+            }
+            return parser.use { getLocaleConfigResourceId(parser, context.packageName) }
+        }
+
+        // @see com.android.server.pm.pkg.parsing.ParsingPackageUtils
+        @XmlRes
+        private fun getLocaleConfigResourceId(parser: XmlResourceParser, packageName: String): Int {
+            do {
+                if (parser.eventType != XmlPullParser.START_TAG) {
+                    continue
+                }
+                if (parser.name != TAG_MANIFEST) {
+                    parser.skipCurrentTag()
+                    continue
+                }
+                if (parser.getAttributeValue(null, ATTR_PACKAGE) != packageName) {
+                    break
+                }
+                while (parser.next() != XmlPullParser.END_TAG) {
+                    if (parser.eventType != XmlPullParser.START_TAG) {
+                        continue
+                    }
+                    if (parser.name != TAG_APPLICATION) {
+                        parser.skipCurrentTag()
+                        continue
+                    }
+                    return parser.getAttributeResourceValue(
+                        NAMESPACE_ANDROID, ATTR_LOCALE_CONFIG, ResourcesCompat.ID_NULL
+                    )
+                }
+            } while (parser.next() != XmlPullParser.END_DOCUMENT)
             return ResourcesCompat.ID_NULL
         }