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

Commit f9465fb6 authored by Etan Cohen's avatar Etan Cohen
Browse files

Merge commit '7e5e791d' into merge2 

Change-Id: Ie4889e3448b905afe5c0df453da96df0735e60d7
parents a5f0b137 7e5e791d

api/current.txt

+0 −2
Original line number Diff line number Diff line
@@ -19283,8 +19283,6 @@ package android.net.wifi { 
    field public java.util.BitSet allowedKeyManagement;

    field public java.util.BitSet allowedPairwiseCiphers;

    field public java.util.BitSet allowedProtocols;

    field public int apBand;

    field public int apChannel;

    field public android.net.wifi.WifiEnterpriseConfig enterpriseConfig;

    field public boolean hiddenSSID;

    field public int networkId;

api/system-current.txt

+0 −2
Original line number Diff line number Diff line
@@ -20982,8 +20982,6 @@ package android.net.wifi { 
    field public java.util.BitSet allowedKeyManagement;

    field public java.util.BitSet allowedPairwiseCiphers;

    field public java.util.BitSet allowedProtocols;

    field public int apBand;

    field public int apChannel;

    field public java.lang.String creatorName;

    field public int creatorUid;

    field public android.net.wifi.WifiEnterpriseConfig enterpriseConfig;

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

+2 −2
Original line number Diff line number Diff line
@@ -243,7 +243,7 @@ public class WifiConfiguration implements Parcelable { 
     * The band which AP resides on

     * 0-2G  1-5G

     * By default, 2G is chosen

     * @hidden

     * @hide

     */

    public int apBand = 0;
@@ -252,7 +252,7 @@ public class WifiConfiguration implements Parcelable { 
     * 2G  1-11

     * 5G  36,40,44,48,149,153,157,161,165

     * 0 - find a random available channel according to the apBand

     * @hidden

     * @hide

     */

    public int apChannel = 0;