commit d4b828f2b30ac09d1a42e8fd935e089f915f2e88
author Jaineel <jaineelm@google.com> Wed Sep 16 13:40:02 2020 -0700
committer Jaineel <jaineelm@google.com> Thu Sep 17 10:10:00 2020 -0700
tree 2d5c084ecb7c234f76c44ddb76d96c4d65dc100c
parent a7831d70ab2c787251db6fa06c70b9e0413f3a21

Adding 5G Meteredness API check in Facade

Meteredness has a new value for 5G NET_CAPABILITY_TEMPORARILY_NOT_METERED
Need to validate this as part of testing
Results will be part of OnCapabilitiesChanged event

Test: Yes, locally
Bug: 168732946
Change-Id: Iff050f6e6572548af2f85a0da5d08269f6515f30

Common/src/com/googlecode/android_scripting/facade/ConnectivityConstants.java

diff --git a/Common/src/com/googlecode/android_scripting/facade/ConnectivityConstants.java b/Common/src/com/googlecode/android_scripting/facade/ConnectivityConstants.java
index 8e5297b..c46a3a1 100644
--- a/Common/src/com/googlecode/android_scripting/facade/ConnectivityConstants.java
+++ b/Common/src/com/googlecode/android_scripting/facade/ConnectivityConstants.java
@@ -66,6 +66,7 @@
         public static final String NETWORK_CALLBACK_EVENT = "networkCallbackEvent";
         public static final String MAX_MS_TO_LIVE = "maxMsToLive";
         public static final String RSSI = "rssi";
+        public static final String METERED = "metered";
         public static final String INTERFACE_NAME = "interfaceName";
         public static final String CREATE_TIMESTAMP = "creation_timestamp";
         public static final String CURRENT_TIMESTAMP = "current_timestamp";
@@ -78,6 +79,11 @@
     public static final String TetheringFailedCallback = "ConnectivityManagerOnTetheringFailed";
 
     /**
+     * Constants for Meteredness
+     */
+    public static final Integer NET_CAPABILITY_TEMPORARILY_NOT_METERED = 25;
+
+    /**
      * Constants for PrivateDnsMode
      */
     public static final String PrivateDnsModeOff = "off";

Common/src/com/googlecode/android_scripting/facade/ConnectivityEvents.java

diff --git a/Common/src/com/googlecode/android_scripting/facade/ConnectivityEvents.java b/Common/src/com/googlecode/android_scripting/facade/ConnectivityEvents.java
index 5c12b7c..ec9834a 100644
--- a/Common/src/com/googlecode/android_scripting/facade/ConnectivityEvents.java
+++ b/Common/src/com/googlecode/android_scripting/facade/ConnectivityEvents.java
@@ -138,6 +138,10 @@
             JSONObject json = super.toJSON();
             json.put(ConnectivityConstants.NetworkCallbackContainer.RSSI,
                     mNetworkCapabilities.getSignalStrength());
+
+            json.put(ConnectivityConstants.NetworkCallbackContainer.METERED,
+                    !mNetworkCapabilities.hasCapability(ConnectivityConstants.NET_CAPABILITY_TEMPORARILY_NOT_METERED));
+
             if (mNetworkCapabilities.getNetworkSpecifier() != null) {
                 json.put("network_specifier",
                         mNetworkCapabilities.getNetworkSpecifier().toString());