[NAN] Add method to ConfigRequest to determine if non-default
To be used in permission check.
Bug: 27696149
Change-Id: I5be5aed93c556cf24b596bd2a7c5672502f84d74
(cherry picked from commit 8266b3f876e6b96ac0f18216b2011b03a0504a23)
diff --git a/wifi/java/android/net/wifi/nan/ConfigRequest.java b/wifi/java/android/net/wifi/nan/ConfigRequest.java
index 4063af0..55e568a 100644
--- a/wifi/java/android/net/wifi/nan/ConfigRequest.java
+++ b/wifi/java/android/net/wifi/nan/ConfigRequest.java
@@ -173,6 +173,18 @@
&& mClusterLow == lhs.mClusterLow && mClusterHigh == lhs.mClusterHigh;
}
+ /**
+ * Checks whether the configuration's settings which impact on-air behavior are non-default.
+ *
+ * @return true if any of the on-air-impacting settings are non-default.
+ *
+ * @hide
+ */
+ public boolean isNonDefaultOnTheAir() {
+ return mSupport5gBand || mMasterPreference != 0 || mClusterLow != CLUSTER_ID_MIN
+ || mClusterHigh != CLUSTER_ID_MAX;
+ }
+
@Override
public int hashCode() {
int result = 17;