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

Commit 726f84ea authored by David Su's avatar David Su Committed by Android (Google) Code Review
Browse files

Merge "Fix references to new S APIs without version checks"

parents bfb7cec2 1349f5c1

wifi/java/android/net/wifi/SoftApConfiguration.java

+9 −0
Original line number Diff line number Diff line
@@ -538,6 +538,15 @@ public final class SoftApConfiguration implements Parcelable { 
        if (!SdkLevel.isAtLeastS()) {

            throw new UnsupportedOperationException();

        }

        return getChannelsInternal();

    }



    /**

     * Internal version bypassing SdkLevel checks

     * TODO(b/173791707): find a better way to allow Wifi to call its own new S APIs.

     * @hide

     */

    public @NonNull SparseIntArray getChannelsInternal() {

        return mChannels.clone();

    }

wifi/java/android/net/wifi/SoftApInfo.java

+9 −0
Original line number Diff line number Diff line
@@ -183,6 +183,15 @@ public final class SoftApInfo implements Parcelable { 
        if (!SdkLevel.isAtLeastS()) {

            throw new UnsupportedOperationException();

        }

        return getWifiStandardInternal();

    }



    /**

     * Internal version bypassing SdkLevel checks

     * TODO(b/173791707): find a better way to allow Wifi to call its own new S APIs.

     * @hide

     */

    public @WifiAnnotations.WifiStandard int getWifiStandardInternal() {

        return mWifiStandard;

    }