commit 7af3ffd1a753a2bfbdb4b01178c3b4b438a8465a
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Thu May 19 22:07:39 2022 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Thu May 19 22:07:39 2022 +0000
tree 05021ad6a441c23d178224b167bc84de83e7539f
parent f283aad923c6e99b66c046bc57ce319447ed865a
parent 833a0b75b29a4daf945efd0a40d8d9326633024f

Snap for 8618009 from 833a0b75b29a4daf945efd0a40d8d9326633024f to tm-frc-extservices-release

Change-Id: Ib89931c77ed44760823032715eca2369c22c13e5

Common/src/com/googlecode/android_scripting/facade/wifi/WifiAwareManagerFacade.java

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();
     }