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

Commit 315ae1eb authored by David Su's avatar David Su
Browse files

SdkLevelUtil: remove isAtLeastSMockable() 

The mockable version can only be used where object construction
is controlled e.g. in Wifi service. For existing public APIs,
SdkLevelUtil cannot be injected because the constructor can't
be changed.

Thus, the strategy for testing this is:
1. Gate the unit tests with the same SDK level requirements,
  and test on a real device with that SDK version, or
2. Use static mocking.

In either case, the mockable version is not useful.

Bug: 169443762
Test: atest FrameworksWifiApiTests
Change-Id: Icf2f32b3a40512f87bf32d1d80622c22e4454406
parent 59fb99b1

wifi/java/android/net/wifi/util/SdkLevelUtil.java

+7 −7
Original line number Original line Diff line number Diff line
@@ -23,17 +23,17 @@ import android.os.Build; 
 *

 *

 * This can be used to disable new Wifi APIs added in Mainline updates on older SDK versions.

 * This can be used to disable new Wifi APIs added in Mainline updates on older SDK versions.

 *

 *

 * Note: if certain functionality is gated with SdkLevelUtil, its corresponding unit tests should

 * also be gated by the same condition. Then, those unit tests will only be exercised on a base

 * system image satisfying that condition.

 * Alternatively, it can be tested via static mocking.

 *

 * @hide

 * @hide

 */

 */

public class SdkLevelUtil {

public class SdkLevelUtil {





    /** This class is instantiable to allow easy mocking. */

    /** This class is not instantiable. */

    public SdkLevelUtil() { }

    private SdkLevelUtil() {}



    /** See {@link #isAtLeastS()}. This version is non-static to allow easy mocking. */

    public boolean isAtLeastSMockable() {

        return isAtLeastS();

    }





    /** Returns true if the Android platform SDK is at least "S", false otherwise. */

    /** Returns true if the Android platform SDK is at least "S", false otherwise. */

    public static boolean isAtLeastS() {

    public static boolean isAtLeastS() {