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

Commit b625377b authored by Jeremy Klein's avatar Jeremy Klein
Browse files

Expose WifiAp methods as @SystemApi. 

GTS tests to follow shortly.

BUG: 22406002
Change-Id: I42883fa5e35a11b4b2d734f07b7d72f2ac0ec1f8
parent f9bf6da6

api/system-current.txt

+6 −0
Original line number Diff line number Diff line
@@ -25518,6 +25518,7 @@ package android.net.wifi { 
  public static class WifiConfiguration.KeyMgmt {

    field public static final int IEEE8021X = 3; // 0x3

    field public static final int NONE = 0; // 0x0

    field public static final int WPA2_PSK = 4; // 0x4

    field public static final int WPA_EAP = 2; // 0x2

    field public static final int WPA_PSK = 1; // 0x1

    field public static final java.lang.String[] strings;
@@ -25649,6 +25650,8 @@ package android.net.wifi { 
    method public java.util.List<android.net.wifi.WifiConfiguration> getPrivilegedConfiguredNetworks();

    method public java.util.List<android.net.wifi.ScanInfo> getScanInfos();

    method public java.util.List<android.net.wifi.ScanResult> getScanResults();

    method public android.net.wifi.WifiConfiguration getWifiApConfiguration();

    method public int getWifiApState();

    method public int getWifiState();

    method public boolean is5GHzBandSupported();

    method public deprecated boolean isBatchedScanSupported();
@@ -25660,6 +25663,7 @@ package android.net.wifi { 
    method public boolean isPreferredNetworkOffloadSupported();

    method public boolean isScanAlwaysAvailable();

    method public boolean isTdlsSupported();

    method public boolean isWifiApEnabled();

    method public boolean isWifiEnabled();

    method public boolean isWifiScannerSupported();

    method public boolean pingSupplicant();
@@ -25670,6 +25674,8 @@ package android.net.wifi { 
    method public void setOsuSelection(int);

    method public void setTdlsEnabled(java.net.InetAddress, boolean);

    method public void setTdlsEnabledWithMacAddress(java.lang.String, boolean);

    method public boolean setWifiApConfiguration(android.net.wifi.WifiConfiguration);

    method public boolean setWifiApEnabled(android.net.wifi.WifiConfiguration, boolean);

    method public boolean setWifiEnabled(boolean);

    method public deprecated boolean startLocationRestrictedScan(android.os.WorkSource);

    method public boolean startScan();

wifi/java/android/net/wifi/WifiConfiguration.java

+1 −0
Original line number Diff line number Diff line
@@ -78,6 +78,7 @@ public class WifiConfiguration implements Parcelable { 
          * (requires {@code preSharedKey} to be specified).

          * @hide

          */

        @SystemApi

        public static final int WPA2_PSK = 4;



        public static final String varName = "key_mgmt";

wifi/java/android/net/wifi/WifiManager.java

+10 −5
Original line number Diff line number Diff line
@@ -1435,8 +1435,9 @@ public class WifiManager { 
     *        part of WifiConfiguration

     * @return {@code true} if the operation succeeds, {@code false} otherwise

     *

     * @hide Dont open up yet

     * @hide

     */

    @SystemApi

    public boolean setWifiApEnabled(WifiConfiguration wifiConfig, boolean enabled) {

        try {

            mService.setWifiApEnabled(wifiConfig, enabled);
@@ -1453,8 +1454,9 @@ public class WifiManager { 
     *         {@link #WIFI_AP_STATE_ENABLING}, {@link #WIFI_AP_STATE_FAILED}

     * @see #isWifiApEnabled()

     *

     * @hide Dont open yet

     * @hide

     */

    @SystemApi

    public int getWifiApState() {

        try {

            return mService.getWifiApEnabledState();
@@ -1468,8 +1470,9 @@ public class WifiManager { 
     * @return {@code true} if Wi-Fi AP is enabled

     * @see #getWifiApState()

     *

     * @hide Dont open yet

     * @hide

     */

    @SystemApi

    public boolean isWifiApEnabled() {

        return getWifiApState() == WIFI_AP_STATE_ENABLED;

    }
@@ -1478,8 +1481,9 @@ public class WifiManager { 
     * Gets the Wi-Fi AP Configuration.

     * @return AP details in WifiConfiguration

     *

     * @hide Dont open yet

     * @hide

     */

    @SystemApi

    public WifiConfiguration getWifiApConfiguration() {

        try {

            return mService.getWifiApConfiguration();
@@ -1507,8 +1511,9 @@ public class WifiManager { 
     * Sets the Wi-Fi AP Configuration.

     * @return {@code true} if the operation succeeded, {@code false} otherwise

     *

     * @hide Dont open yet

     * @hide

     */

    @SystemApi

    public boolean setWifiApConfiguration(WifiConfiguration wifiConfig) {

        try {

            mService.setWifiApConfiguration(wifiConfig);