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

Merge "Revert "Add android.hardware.fingerprint for pre-Q""

Browse Source
This commit is contained in:
TreeHugger Robot
2019-01-29 22:23:21 +00:00
committed by Android (Google) Code Review
parent 526e9a00da 06f2c9fc73
commit 1ebc40339a
2 changed files with 0 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
tools/aapt2/link/ManifestFixer.cpp
View File

@@ -213,27 +213,6 @@ static bool VerifyUsesFeature(xml::Element* el, SourcePathDiagnostics* diag) {
return true;
}
static bool AddDeprecatedUsesFeatures(xml::Element* el, SourcePathDiagnostics* diag) {
if (xml::Attribute* attr = el->FindAttribute(xml::kSchemaAndroid, "name")) {
if (attr->value.empty()) {
return true;
}
// Add "android.hardware.fingerprint" when "android.hardware.biometric.fingerprint" is found,
// since the former is deprecated in Q and the latter is not present pre-Q. (see b/115639644)
if (attr->value == "android.hardware.biometrics.fingerprint") {
auto element = el->CloneElement([&](const xml::Element& el, xml::Element* out_el) {
xml::Attribute* cloned_attr = out_el->FindOrCreateAttribute(xml::kSchemaAndroid, "name");
cloned_attr->value = "android.hardware.fingerprint";
});
el->parent->AppendChild(std::move(element));
}
}
return true;
}
bool ManifestFixer::BuildRules(xml::XmlActionExecutor* executor,
IDiagnostics* diag) {
// First verify some options.
@@ -268,7 +247,6 @@ bool ManifestFixer::BuildRules(xml::XmlActionExecutor* executor,
// Common <uses-feature> actions.
xml::XmlNodeAction uses_feature_action;
uses_feature_action.Action(VerifyUsesFeature);
uses_feature_action.Action(AddDeprecatedUsesFeatures);
// Common component actions.
xml::XmlNodeAction component_action;

32
tools/aapt2/link/ManifestFixer_test.cpp
View File

@@ -832,36 +832,4 @@ TEST_F(ManifestFixerTest, UsesLibraryMustHaveNonEmptyName) {
EXPECT_THAT(Verify(input), NotNull());
}
TEST_F(ManifestFixerTest, UsesFeatureAddDeprecated) {
std::string input = R"(
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="android">
<uses-feature android:name="android.hardware.biometrics.fingerprint" />
<feature-group>
<uses-feature android:name="android.hardware.biometrics.fingerprint" />
</feature-group>
</manifest>)";
std::unique_ptr<xml::XmlResource> manifest = Verify(input);
ASSERT_THAT(manifest, NotNull());
EXPECT_THAT(manifest->root->FindChildWithAttribute("", "uses-feature",
xml::kSchemaAndroid, "name",
"android.hardware.biometrics.fingerprint"),
Ne(nullptr));
EXPECT_THAT(manifest->root->FindChildWithAttribute("", "uses-feature",
xml::kSchemaAndroid, "name",
"android.hardware.fingerprint"),
Ne(nullptr));
xml::Element* feature_group = manifest->root->FindChild("", "feature-group");
ASSERT_THAT(feature_group, Ne(nullptr));
EXPECT_THAT(feature_group->FindChildWithAttribute("", "uses-feature", xml::kSchemaAndroid, "name",
"android.hardware.biometrics.fingerprint"),
Ne(nullptr));
EXPECT_THAT(feature_group->FindChildWithAttribute("", "uses-feature", xml::kSchemaAndroid, "name",
"android.hardware.fingerprint"),
Ne(nullptr));
}
} // namespace aapt