Merge "More API review feedback" into mnc-dev

2 files changed, 8 insertions, 4 deletions

diff --git a/wifi/java/android/net/wifi/ScanResult.java b/wifi/java/android/net/wifi/ScanResult.java
index fc6a3de..cc1e976 100644
--- a/wifi/java/android/net/wifi/ScanResult.java
+++ b/wifi/java/android/net/wifi/ScanResult.java
@@ -216,11 +216,15 @@ public class ScanResult implements Parcelable {
      */
     public int distanceSdCm;
 
+    /** {@hide} */
     public static final long FLAG_PASSPOINT_NETWORK               = 0x0000000000000001;
+
+    /** {@hide} */
     public static final long FLAG_80211mc_RESPONDER               = 0x0000000000000002;
 
     /**
      * Defines flags; such as {@link #FLAG_PASSPOINT_NETWORK}.
+     * {@hide}
      */
     public long flags;
 
diff --git a/wifi/java/android/net/wifi/WifiConfiguration.java b/wifi/java/android/net/wifi/WifiConfiguration.java
index 5d834f6..4f221ae 100644
--- a/wifi/java/android/net/wifi/WifiConfiguration.java
+++ b/wifi/java/android/net/wifi/WifiConfiguration.java
@@ -352,7 +352,7 @@ public class WifiConfiguration implements Parcelable {
      * Roaming Consortium Id list for passpoint credential; identifies a set of networks where
      * passpoint credential will be considered valid
      */
-    public Long[] roamingConsortiumIds;
+    public long[] roamingConsortiumIds;
 
     /**
      * @hide
@@ -907,7 +907,7 @@ public class WifiConfiguration implements Parcelable {
         SSID = null;
         BSSID = null;
         FQDN = null;
-        roamingConsortiumIds = new Long[0];
+        roamingConsortiumIds = new long[0];
         priority = 0;
         hiddenSSID = false;
         disableReason = DISABLED_UNKNOWN_REASON;
@@ -1544,7 +1544,7 @@ public class WifiConfiguration implements Parcelable {
         dest.writeString(FQDN);
         dest.writeString(providerFriendlyName);
         dest.writeInt(roamingConsortiumIds.length);
-        for (Long roamingConsortiumId : roamingConsortiumIds) {
+        for (long roamingConsortiumId : roamingConsortiumIds) {
             dest.writeLong(roamingConsortiumId);
         }
         dest.writeString(preSharedKey);
@@ -1619,7 +1619,7 @@ public class WifiConfiguration implements Parcelable {
                 config.FQDN = in.readString();
                 config.providerFriendlyName = in.readString();
                 int numRoamingConsortiumIds = in.readInt();
-                config.roamingConsortiumIds = new Long[numRoamingConsortiumIds];
+                config.roamingConsortiumIds = new long[numRoamingConsortiumIds];
                 for (int i = 0; i < numRoamingConsortiumIds; i++) {
                     config.roamingConsortiumIds[i] = in.readLong();
                 }