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

Merge "Make WifiDeviceFilter.Builder.setSsid's arg @NonNull" into rvc-dev

Browse Source
This commit is contained in:
Eugene Susla
2020-03-11 00:31:45 +00:00
committed by Android (Google) Code Review
parent 93a9ab17ef ad5e4920e0
commit 4256be1c69
2 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/current.txt
View File

@@ -9466,7 +9466,7 @@ package android.companion {
public static final class WifiDeviceFilter.Builder { public static final class WifiDeviceFilter.Builder {
ctor public WifiDeviceFilter.Builder(); ctor public WifiDeviceFilter.Builder();
method @NonNull public android.companion.WifiDeviceFilter build(); method @NonNull public android.companion.WifiDeviceFilter build();
method @NonNull public android.companion.WifiDeviceFilter.Builder setBssid(@Nullable android.net.MacAddress); method @NonNull public android.companion.WifiDeviceFilter.Builder setBssid(@NonNull android.net.MacAddress);
method @NonNull public android.companion.WifiDeviceFilter.Builder setBssidMask(@NonNull android.net.MacAddress); method @NonNull public android.companion.WifiDeviceFilter.Builder setBssidMask(@NonNull android.net.MacAddress);
method @NonNull public android.companion.WifiDeviceFilter.Builder setNamePattern(@Nullable java.util.regex.Pattern); method @NonNull public android.companion.WifiDeviceFilter.Builder setNamePattern(@Nullable java.util.regex.Pattern);
} }

15
core/java/android/companion/WifiDeviceFilter.java
View File

@@ -51,6 +51,7 @@ public final class WifiDeviceFilter implements DeviceFilter<ScanResult> {
* expression will be shown * expression will be shown
*/ */
@DataClass.ParcelWith(Parcelling.BuiltIn.ForPattern.class) @DataClass.ParcelWith(Parcelling.BuiltIn.ForPattern.class)
@DataClass.MaySetToNull
private @Nullable Pattern mNamePattern = null; private @Nullable Pattern mNamePattern = null;
/** /**
@@ -86,7 +87,7 @@ public final class WifiDeviceFilter implements DeviceFilter<ScanResult> {
// Code below generated by codegen v1.0.11. // Code below generated by codegen v1.0.15.
// //
// DO NOT MODIFY! // DO NOT MODIFY!
// CHECKSTYLE:OFF Generated code // CHECKSTYLE:OFF Generated code
@@ -273,7 +274,7 @@ public final class WifiDeviceFilter implements DeviceFilter<ScanResult> {
* If set, only devices with BSSID matching the given one will be shown * If set, only devices with BSSID matching the given one will be shown
*/ */
@DataClass.Generated.Member @DataClass.Generated.Member
public @NonNull Builder setBssid(@Nullable MacAddress value) { public @NonNull Builder setBssid(@NonNull MacAddress value) {
checkNotUsed(); checkNotUsed();
mBuilderFieldsSet |= 0x2; mBuilderFieldsSet |= 0x2;
mBssid = value; mBssid = value;
@@ -322,11 +323,15 @@ public final class WifiDeviceFilter implements DeviceFilter<ScanResult> {
} }
@DataClass.Generated( @DataClass.Generated(
time = 1571960300742L, time = 1582688421965L,
codegenVersion = "1.0.11", codegenVersion = "1.0.15",
sourceFile = "frameworks/base/core/java/android/companion/WifiDeviceFilter.java", sourceFile = "frameworks/base/core/java/android/companion/WifiDeviceFilter.java",
inputSignatures = "private @com.android.internal.util.DataClass.ParcelWith(com.android.internal.util.Parcelling.BuiltIn.ForPattern.class) @android.annotation.Nullable java.util.regex.Pattern mNamePattern\nprivate @android.annotation.Nullable android.net.MacAddress mBssid\nprivate @android.annotation.NonNull android.net.MacAddress mBssidMask\npublic @java.lang.Override boolean matches(android.net.wifi.ScanResult)\npublic @java.lang.Override java.lang.String getDeviceDisplayName(android.net.wifi.ScanResult)\npublic @java.lang.Override int getMediumType()\nclass WifiDeviceFilter extends java.lang.Object implements [android.companion.DeviceFilter<android.net.wifi.ScanResult>]\n@com.android.internal.util.DataClass(genParcelable=true, genAidl=false, genBuilder=true, genEqualsHashCode=true, genHiddenGetters=true)") inputSignatures = "private @com.android.internal.util.DataClass.ParcelWith(com.android.internal.util.Parcelling.BuiltIn.ForPattern.class) @com.android.internal.util.DataClass.MaySetToNull @android.annotation.Nullable java.util.regex.Pattern mNamePattern\nprivate @android.annotation.Nullable android.net.MacAddress mBssid\nprivate @android.annotation.NonNull android.net.MacAddress mBssidMask\npublic @java.lang.Override boolean matches(android.net.wifi.ScanResult)\npublic @java.lang.Override java.lang.String getDeviceDisplayName(android.net.wifi.ScanResult)\npublic @java.lang.Override int getMediumType()\nclass WifiDeviceFilter extends java.lang.Object implements [android.companion.DeviceFilter<android.net.wifi.ScanResult>]\n@com.android.internal.util.DataClass(genParcelable=true, genAidl=false, genBuilder=true, genEqualsHashCode=true, genHiddenGetters=true)")
@Deprecated @Deprecated
private void __metadata() {} private void __metadata() {}
//@formatter:on
// End of generated code
} }