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

Commit 1b298170 authored by Jared Duke's avatar Jared Duke
Browse files

Use hasSystemFeature(String) overload for RoSystemFeatures fallback 

Prefer the simpler overload when falling back to runtime queries. This
has identical semantics to hasSystemFeature(String, 0), but avoids the
need to update any/all mocked overrides that reference the simpler (and
more common) overload. There should be no functional impact otherwise.

Bug: 203143243
Flag: EXEMPT refactor
Test: atest systemfeatures-gen-golden-tests systemfeatures-gen-tests
Change-Id: I7a527663c677000f49426c6df02875e63a928e09
parent 45140612

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);

    }



    /**