Merge "Add android.hardware.fingerprint for pre-Q" (bf08b911) · Commits · e / os / android_frameworks_base

tools/aapt2/link/ManifestFixer.cpp

+22 −0

Original line number	Diff line number	Diff line
		@@ -213,6 +213,27 @@ 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.
		@@ -247,6 +268,7 @@ 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 −0

Original line number	Diff line number	Diff line
		@@ -832,4 +832,36 @@ 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