Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a73a54ca authored Jan 09, 2025 by Treehugger Robot Committed by Automerger Merge Worker Jan 09, 2025

Merge "Use hasSystemFeature(String) overload for RoSystemFeatures fallback"...

Merge "Use hasSystemFeature(String) overload for RoSystemFeatures fallback" into main am: 79acd30b

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3446549

Change-Id: I7bdd4d5d68b6a1a27f62c91d6458f4f3847d0d18
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

parents fc2d96d9 79acd30b

tools/systemfeatures/src/com/android/systemfeatures/SystemFeaturesGenerator.kt

+1 −1

Original line number	Diff line number	Diff line
		@@ -263,7 +263,7 @@ object SystemFeaturesGenerator {
		.returns(Boolean::class.java)
		.addParameter(CONTEXT_CLASS, "context")
		.addParameter(String::class.java, "featureName")
		.addStatement("return context.getPackageManager().hasSystemFeature(featureName, 0)")
		.addStatement("return context.getPackageManager().hasSystemFeature(featureName)")
		.build()
		)
		}

tools/systemfeatures/tests/golden/RoFeatures.java.gen

+1 −1

Original line number	Diff line number	Diff line
		@@ -70,7 +70,7 @@ public final class RoFeatures {
		}

		private static boolean hasFeatureFallback(Context context, String featureName) {
		return context.getPackageManager().hasSystemFeature(featureName, 0);
		return context.getPackageManager().hasSystemFeature(featureName);
		}

		/**

tools/systemfeatures/tests/golden/RoNoFeatures.java.gen

+1 −1

Original line number	Diff line number	Diff line
		@@ -25,7 +25,7 @@ public final class RoNoFeatures {
		}

		private static boolean hasFeatureFallback(Context context, String featureName) {
		return context.getPackageManager().hasSystemFeature(featureName, 0);
		return context.getPackageManager().hasSystemFeature(featureName);
		}

		/**

tools/systemfeatures/tests/golden/RwFeatures.java.gen

+1 −1

Original line number	Diff line number	Diff line
		@@ -55,7 +55,7 @@ public final class RwFeatures {
		}

		private static boolean hasFeatureFallback(Context context, String featureName) {
		return context.getPackageManager().hasSystemFeature(featureName, 0);
		return context.getPackageManager().hasSystemFeature(featureName);
		}

		/**

tools/systemfeatures/tests/golden/RwNoFeatures.java.gen

+1 −1

Original line number	Diff line number	Diff line
		@@ -14,7 +14,7 @@ import android.util.ArrayMap;
		*/
		public final class RwNoFeatures {
		private static boolean hasFeatureFallback(Context context, String featureName) {
		return context.getPackageManager().hasSystemFeature(featureName, 0);
		return context.getPackageManager().hasSystemFeature(featureName);
		}

		/**