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

Commit 2fb540e0 authored by Roshan Pius's avatar Roshan Pius Committed by Android (Google) Code Review
Browse files

Merge changes I2d88af7e,Ic0730eca 

* changes:
  WifiNetworkSuggestion/Specifier: Fix javadoc
  wifi.proto: Add wifi config store IO duration metrics
parents 6686d19f 34929e32

proto/src/wifi.proto

+25 −0
Original line number Diff line number Diff line
@@ -515,6 +515,9 @@ message WifiLog { 


  // Total number of scan results for WPA3-Enterprise networks

  optional int32 num_wpa3_enterprise_network_scan_results = 136;



  // WifiConfigStore read/write metrics.

  optional WifiConfigStoreIO wifi_config_store_io = 137;

}



// Information that gets logged for every WiFi connection.
@@ -2170,3 +2173,25 @@ message WifiDppLog { 
    EASY_CONNECT_EVENT_FAILURE_INVALID_NETWORK = 9;

  }

}



// WifiConfigStore read/write metrics.

message WifiConfigStoreIO {

  // Histogram of config store read durations.

  repeated DurationBucket read_durations = 1;



  // Histogram of config store write durations.

  repeated DurationBucket write_durations = 2;



  // Total Number of instances of write/read duration in this duration bucket.

  message DurationBucket {

    // Bucket covers duration : [range_start_ms, range_end_ms)

    // The (inclusive) lower bound of read/write duration represented by this bucket

    optional int32 range_start_ms = 1;



    // The (exclusive) upper bound of read/write duration represented by this bucket

    optional int32 range_end_ms = 2;



    // Number of read/write durations that fit into this bucket

    optional int32 count = 3;

  }

}

wifi/java/android/net/wifi/WifiNetworkSpecifier.java

+1 −1
Original line number Diff line number Diff line
@@ -421,7 +421,7 @@ public final class WifiNetworkSpecifier extends NetworkSpecifier implements Parc 
         *      .setSsidPattern(new PatternMatcher("test", PatterMatcher.PATTERN_PREFIX))

         *      .setBssidPattern(MacAddress.fromString("10:03:23:00:00:00"),

         *                       MacAddress.fromString("ff:ff:ff:00:00:00"))

         *      .buildNetworkSpecifier()

         *      .build()

         * final NetworkRequest request =

         *      new NetworkRequest.Builder()

         *      .addTransportType(NetworkCapabilities.TRANSPORT_WIFI)

wifi/java/android/net/wifi/WifiNetworkSuggestion.java

+3 −3
Original line number Diff line number Diff line
@@ -413,17 +413,17 @@ public final class WifiNetworkSuggestion implements Parcelable { 
         * final WifiNetworkSuggestion suggestion1 =

         *      new Builder()

         *      .setSsid("test111111")

         *      .buildNetworkSuggestion()

         *      .build()

         * final WifiNetworkSuggestion suggestion2 =

         *      new Builder()

         *      .setSsid("test222222")

         *      .setWpa2Passphrase("test123456")

         *      .buildNetworkSuggestion()

         *      .build()

         * final WifiNetworkSuggestion suggestion3 =

         *      new Builder()

         *      .setSsid("test333333")

         *      .setWpa3Passphrase("test6789")

         *      .buildNetworkSuggestion()

         *      .build()

         * final List<WifiNetworkSuggestion> suggestionsList =

         *      new ArrayList<WifiNetworkSuggestion> {{

         *          add(suggestion1);