Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Make ScanResult final." into rvc-dev am: b99ba10bec am: 35d84d4e27 am: bb72743e24

Browse Source 
Change-Id: Id50ac82c3668648fd9809839788e1c37ab782667
This commit is contained in:
Michael Wright
2020-03-20 19:44:18 +00:00
committed by Automerger Merge Worker
parent ea6ef56dab bb72743e24
commit b2764cdd95
7 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/current.txt
View File

@@ -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();

2
api/system-current.txt
View File

@@ -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

2
api/system-removed.txt
View File

@@ -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;
}

2
wifi/api/current.txt
View File

@@ -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();

2
wifi/api/system-current.txt
View File

@@ -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

2
wifi/api/system-removed.txt
View File

@@ -8,7 +8,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;
}

2
wifi/java/android/net/wifi/ScanResult.java
View File

@@ -38,7 +38,7 @@ import java.util.Objects;
* {@code quality}, {@code noise}, and {@code maxbitrate} attributes,
* but does not currently report them to external clients.
*/
public class ScanResult implements Parcelable {
public final class ScanResult implements Parcelable {
/**
* The network name.
*/