コミット: bf10629e34e836527a7cb855d633f6a932fed89a - frameworks-base (git)

frameworks/base

コミットメタ情報

• リビジョン: bf10629e34e836527a7cb855d633f6a932fed89a (tree)
• 日時: 2018-04-25 19:46:45
• 作者: Chih-Wei Huang <cwhuang@linu...>
• コミッター: Chih-Wei Huang

ログメッセージ

houdini: match package name by patterns

PRC apps from different markets usually have different package names.
This change tries to match them by patterns.

To test it, install the Implosion apps from Wandoujia and CoolMarket
and run them OK.

変更サマリ

• modified: core/jni/abipicker/ABIPicker.cpp

差分

--- a/core/jni/abipicker/ABIPicker.cpp
+++ b/core/jni/abipicker/ABIPicker.cpp
@@ -5,6 +5,7 @@
 
 #include <androidfw/ZipFileRO.h>
 #include <androidfw/ZipUtils.h>
+#include <fnmatch.h>
 
 namespace android {
 #define ARR_SIZE(x)     (sizeof(x)/sizeof(x[0]))
@@ -106,8 +107,8 @@ bool isInOEMWhiteList(const char* pkgName) {
     Vector<char*>::iterator it = cfgWhite.begin();
     for (; it != cfgWhite.end(); it++) {
        P_LOG("whitelist : %s", *it);
-       if (0 == strcmp(pkgName, *it)) {
-          ALOGI("found %s in whitelist", pkgName);
+       if (0 == fnmatch(*it, pkgName, 0)) {
+          ALOGI("whitelist %s by %s", pkgName, *it);
           result = true;
           break;
        }
@@ -128,8 +129,8 @@ bool isInOEMBlackList(const char* pkgName) {
 
     Vector<char*>::iterator it = cfgBlack.begin();
     for (; it != cfgBlack.end(); it++) {
-       if (0 == strcmp(pkgName, *it)) {
-          ALOGI("found %s in blacklist", pkgName);
+       if (0 == fnmatch(*it, pkgName, 0)) {
+          ALOGI("blacklist %s by %s", pkgName, *it);
           result = true;
           break;
        }