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

Commit bb72743e authored by Michael Wright's avatar Michael Wright Committed by Automerger Merge Worker
Browse files

Merge "Make ScanResult final." into rvc-dev am: b99ba10b am: 35d84d4e 

Change-Id: I272a9a8577a463f2699eff24960828e81cc8da2a
parents c62fc0df 35d84d4e

api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -31110,7 +31110,7 @@ package android.net.wifi { 
    field public static final int EASY_CONNECT_EVENT_FAILURE_TIMEOUT = -6; // 0xfffffffa

  }













  public class ScanResult implements android.os.Parcelable {













  public final class ScanResult implements android.os.Parcelable {















    ctor public ScanResult(@NonNull android.net.wifi.ScanResult);















    ctor public ScanResult();















    method public int describeContents();

























api/system-current.txt



+1
−1




























Original line number
Diff line number
Diff line








@@ -7066,7 +7066,7 @@ package android.net.wifi {













    field @Deprecated public byte id;















  }



























  public class ScanResult implements android.os.Parcelable {













  public final class ScanResult implements android.os.Parcelable {















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















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















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

































api/system-removed.txt



+1
−1




























Original line number
Diff line number
Diff line








@@ -136,7 +136,7 @@ package android.net.wifi {













    field public boolean truncated;















  }





























  public class ScanResult implements android.os.Parcelable {













  public final class ScanResult implements android.os.Parcelable {















    field public boolean untrusted;















  }

















































wifi/api/current.txt



+1
−1




























Original line number
Diff line number
Diff line








@@ -16,7 +16,7 @@ package android.net.wifi {













    field public static final int EASY_CONNECT_EVENT_FAILURE_TIMEOUT = -6; // 0xfffffffa















  }





























  public class ScanResult implements android.os.Parcelable {













  public final class ScanResult implements android.os.Parcelable {















    ctor public ScanResult(@NonNull android.net.wifi.ScanResult);















    ctor public ScanResult();















    method public int describeContents();

































wifi/api/system-current.txt



+1
−1




























Original line number
Diff line number
Diff line








@@ -208,7 +208,7 @@ package android.net.wifi {













    field @Deprecated public byte id;















  }





























  public class ScanResult implements android.os.Parcelable {













  public final class ScanResult implements android.os.Parcelable {















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















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















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