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

Commit 4256be1c authored by Eugene Susla's avatar Eugene Susla Committed by Android (Google) Code Review
Browse files

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

parents 93a9ab17 ad5e4920

api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -9466,7 +9466,7 @@ package android.companion { 
  public static final class WifiDeviceFilter.Builder {

    ctor public WifiDeviceFilter.Builder();

    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 setNamePattern(@Nullable java.util.regex.Pattern);

  }

core/java/android/companion/WifiDeviceFilter.java

+10 −5
Original line number Diff line number Diff line
@@ -51,6 +51,7 @@ public final class WifiDeviceFilter implements DeviceFilter<ScanResult> { 
     * expression will be shown

     */

    @DataClass.ParcelWith(Parcelling.BuiltIn.ForPattern.class)

    @DataClass.MaySetToNull

    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!

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

         */

        @DataClass.Generated.Member

        public @NonNull Builder setBssid(@Nullable MacAddress value) {

        public @NonNull Builder setBssid(@NonNull MacAddress value) {

            checkNotUsed();

            mBuilderFieldsSet |= 0x2;

            mBssid = value;
@@ -322,11 +323,15 @@ public final class WifiDeviceFilter implements DeviceFilter<ScanResult> { 
    }



    @DataClass.Generated(

            time = 1571960300742L,

            codegenVersion = "1.0.11",

            time = 1582688421965L,

            codegenVersion = "1.0.15",

            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

    private void __metadata() {}





    //@formatter:on

    // End of generated code



}