Merge "WifiConfiguration: Correct documentation for priority"

am: f5fa26bf25

Change-Id: I37fd50fac3dc6c2db8c677d1a265fca73babf5da

diff --combined wifi/java/android/net/wifi/WifiConfiguration.java
index c3bca86,dac511e..03b9328
--- 1/wifi/java/android/net/wifi/WifiConfiguration.java
--- 2/wifi/java/android/net/wifi/WifiConfiguration.java
+++ b/wifi/java/android/net/wifi/WifiConfiguration.java
@@@ -307,7 -307,7 +307,7 @@@ public class WifiConfiguration implemen
      /**
       * Priority determines the preference given to a network by {@code wpa_supplicant}
       * when choosing an access point with which to associate.
-      * @deprecated Priority is no longer used.
+      * @deprecated This field does not exist anymore.
       */
      @Deprecated
      public int priority;
@@@ -499,12 -499,6 +499,12 @@@
  
      /**
       * @hide
 +     * Set to true if this is a Carrier Network, else set to false.
 +     */
 +    public boolean isCarrierNetwork = false;
 +
 +    /**
 +     * @hide
       * A summary of the RSSI and Band status for that configuration
       * This is used as a temporary value by the auto-join controller
       */
@@@ -1611,7 -1605,6 +1611,7 @@@
          sbuf.append(" lcuid=" + lastConnectUid);
          sbuf.append(" userApproved=" + userApprovedAsString(userApproved));
          sbuf.append(" noInternetAccessExpected=" + noInternetAccessExpected);
 +        sbuf.append(" isCarrierNetwork=" + isCarrierNetwork);
          sbuf.append(" ");
  
          if (this.lastConnected != 0) {
@@@ -1997,7 -1990,6 +1997,7 @@@
              userApproved = source.userApproved;
              numNoInternetAccessReports = source.numNoInternetAccessReports;
              noInternetAccessExpected = source.noInternetAccessExpected;
 +            isCarrierNetwork = source.isCarrierNetwork;
              creationTime = source.creationTime;
              updateTime = source.updateTime;
              shared = source.shared;
@@@ -2065,7 -2057,6 +2065,7 @@@
          dest.writeInt(userApproved);
          dest.writeInt(numNoInternetAccessReports);
          dest.writeInt(noInternetAccessExpected ? 1 : 0);
 +        dest.writeInt(isCarrierNetwork ? 1 : 0);
          dest.writeInt(shared ? 1 : 0);
          dest.writeString(mPasspointManagementObjectTree);
      }
@@@ -2133,7 -2124,6 +2133,7 @@@
                  config.userApproved = in.readInt();
                  config.numNoInternetAccessReports = in.readInt();
                  config.noInternetAccessExpected = in.readInt() != 0;
 +                config.isCarrierNetwork = in.readInt() != 0;
                  config.shared = in.readInt() != 0;
                  config.mPasspointManagementObjectTree = in.readString();
                  return config;