Snap for 8617783 from 833a0b75b29a4daf945efd0a40d8d9326633024f to tm-frc-art-release
Change-Id: I7b578d61435bdfb4de45108b8afe492c296a7e77
diff --git a/Common/src/com/googlecode/android_scripting/facade/wifi/WifiAwareManagerFacade.java b/Common/src/com/googlecode/android_scripting/facade/wifi/WifiAwareManagerFacade.java
index c690a38..7586039 100644
--- a/Common/src/com/googlecode/android_scripting/facade/wifi/WifiAwareManagerFacade.java
+++ b/Common/src/com/googlecode/android_scripting/facade/wifi/WifiAwareManagerFacade.java
@@ -25,6 +25,7 @@
import android.net.NetworkSpecifier;
import android.net.wifi.RttManager;
import android.net.wifi.RttManager.RttResult;
+import android.net.wifi.WifiScanner;
import android.net.wifi.aware.AttachCallback;
import android.net.wifi.aware.ConfigRequest;
import android.net.wifi.aware.DiscoverySession;
@@ -47,6 +48,7 @@
import android.util.SparseArray;
import com.android.internal.annotations.GuardedBy;
+import com.android.modules.utils.build.SdkLevel;
import libcore.util.HexEncoding;
@@ -64,6 +66,7 @@
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.List;
+import java.util.Objects;
/**
* WifiAwareManager functions.
@@ -280,7 +283,11 @@
if (j.has("RangingEnabled")) {
builder.setRangingEnabled(j.getBoolean("RangingEnabled"));
}
-
+ if (SdkLevel.isAtLeastT() && j.has("InstantModeEnabled")) {
+ builder.setInstantCommunicationModeEnabled(true,
+ Objects.equals(j.getString("InstantModeEnabled"), "5G")
+ ? WifiScanner.WIFI_BAND_5_GHZ : WifiScanner.WIFI_BAND_24_GHZ);
+ }
return builder.build();
}
@@ -329,6 +336,11 @@
if (j.has("MaxDistanceMm")) {
builder.setMaxDistanceMm(j.getInt("MaxDistanceMm"));
}
+ if (SdkLevel.isAtLeastT() && j.has("InstantModeEnabled")) {
+ builder.setInstantCommunicationModeEnabled(true,
+ Objects.equals(j.getString("InstantModeEnabled"), "5G")
+ ? WifiScanner.WIFI_BAND_5_GHZ : WifiScanner.WIFI_BAND_24_GHZ);
+ }
return builder.build();
}