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

Merge "AAPT2: whitelist alphanums instead of blacklisting hyphens in package names." into oc-mr1-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2017-11-18 03:03:19 +00:00
committed by Android (Google) Code Review
parent 16277b2ac0 2ba1bc579f
commit e7b0a330db
2 changed files with 22 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
tools/aapt2/cmd/Util.cpp
View File

@@ -140,12 +140,27 @@ static xml::NamespaceDecl CreateAndroidNamespaceDecl() {
return decl; return decl;
} }
// Returns a copy of 'name' which conforms to the regex '[a-zA-Z]+[a-zA-Z0-9_]*' by
// replacing nonconforming characters with underscores.
//
// See frameworks/base/core/java/android/content/pm/PackageParser.java which
// checks this at runtime.
static std::string MakePackageSafeName(const std::string &name) { static std::string MakePackageSafeName(const std::string &name) {
std::string result(name); std::string result(name);
bool first = true;
for (char &c : result) { for (char &c : result) {
if (c == '-') { if ((c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z')) {
c = '_'; first = false;
continue;
} }
if (!first) {
if (c >= '0' && c <= '9') {
continue;
}
}
c = '_';
first = false;
} }
return result; return result;
} }

9
tools/aapt2/cmd/Util_test.cpp
View File

@@ -24,15 +24,16 @@ namespace aapt {
TEST(UtilTest, SplitNamesAreSanitized) { TEST(UtilTest, SplitNamesAreSanitized) {
AppInfo app_info{"com.pkg"}; AppInfo app_info{"com.pkg"};
SplitConstraints split_constraints{{test::ParseConfigOrDie("en-rUS-land")}}; SplitConstraints split_constraints{
{test::ParseConfigOrDie("en-rUS-land"), test::ParseConfigOrDie("b+sr+Latn")}};
const auto doc = GenerateSplitManifest(app_info, split_constraints); const auto doc = GenerateSplitManifest(app_info, split_constraints);
const auto &root = doc->root; const auto &root = doc->root;
EXPECT_EQ(root->name, "manifest"); EXPECT_EQ(root->name, "manifest");
// split names cannot contain hyphens // split names cannot contain hyphens or plus signs.
EXPECT_EQ(root->FindAttribute("", "split")->value, "config.en_rUS_land"); EXPECT_EQ(root->FindAttribute("", "split")->value, "config.b_sr_Latn_en_rUS_land");
// but we should use resource qualifiers verbatim in 'targetConfig'. // but we should use resource qualifiers verbatim in 'targetConfig'.
EXPECT_EQ(root->FindAttribute("", "targetConfig")->value, "en-rUS-land"); EXPECT_EQ(root->FindAttribute("", "targetConfig")->value, "b+sr+Latn,en-rUS-land");
} }
} // namespace aapt } // namespace aapt