commit 88707d2ec362fb50a379b6538927e54116d9c4af
author Stephanie Bak <dasol@google.com> Thu Feb 25 00:17:23 2021 +0000
committer Stephanie Bak <dasol@google.com> Thu Feb 25 03:21:49 2021 +0000
tree c2894930886d95f1f69c1aee9c3ba893d7abd20a
parent 0f3f798fd67b89ca475ee24bd473824676af51f9

MutableLong: Remove uses of deprecated MutableLong class

Removed usage of MutableLong class within wifi stack

Bug: 122038137
Test: atest HalDeviceManagerTest
Test: atest WifiVendorHalTest
Change-Id: I0ec0394878f16e5be88d73e1a560f2a714985da3

service/java/com/android/server/wifi/HalDeviceManager.java

diff --git a/service/java/com/android/server/wifi/HalDeviceManager.java b/service/java/com/android/server/wifi/HalDeviceManager.java
index c32daba..1045445 100644
--- a/service/java/com/android/server/wifi/HalDeviceManager.java
+++ b/service/java/com/android/server/wifi/HalDeviceManager.java
@@ -40,7 +40,6 @@
 import android.os.RemoteException;
 import android.os.WorkSource;
 import android.util.Log;
-import android.util.MutableLong;
 import android.util.Pair;
 import android.util.SparseArray;
 import android.util.SparseIntArray;
@@ -1114,7 +1113,7 @@
                         return null;
                     }
 
-                    MutableLong chipCapabilities = new MutableLong(0);
+                    Mutable<Long> chipCapabilities = new Mutable<>(0L);
                     chipCapabilities.value = getChipCapabilities(chipResp.value);
 
                     Mutable<ArrayList<String>> ifaceNamesResp = new Mutable<>();
@@ -2571,7 +2570,7 @@
         if (wifiChip == null) return featureSet;
 
         try {
-            final MutableLong feat = new MutableLong(CHIP_CAPABILITY_UNINITIALIZED);
+            final Mutable<Long> feat = new Mutable<>(CHIP_CAPABILITY_UNINITIALIZED);
             synchronized (mLock) {
                 android.hardware.wifi.V1_5.IWifiChip iWifiChipV15 =
                         getWifiChipForV1_5Mockable(wifiChip);
@@ -2579,7 +2578,7 @@
                 if (iWifiChipV15 != null) {
                     iWifiChipV15.getCapabilities_1_5((status, capabilities) -> {
                         if (!ok("getCapabilities_1_5", status)) return;
-                        feat.value = capabilities;
+                        feat.value = (long) capabilities;
                     });
                 }
             }

service/java/com/android/server/wifi/WifiVendorHal.java

diff --git a/service/java/com/android/server/wifi/WifiVendorHal.java b/service/java/com/android/server/wifi/WifiVendorHal.java
index 285667b..79bf017 100644
--- a/service/java/com/android/server/wifi/WifiVendorHal.java
+++ b/service/java/com/android/server/wifi/WifiVendorHal.java
@@ -63,7 +63,6 @@
 import android.os.WorkSource;
 import android.text.TextUtils;
 import android.util.Log;
-import android.util.MutableLong;
 import android.util.Pair;
 import android.util.SparseArray;
 
@@ -1544,7 +1543,7 @@
             return getSupportedFeatureSetFromPackageManager();
         }
         try {
-            final MutableLong feat = new MutableLong(0);
+            final Mutable<Long> feat = new Mutable<>(0L);
             synchronized (sLock) {
                 android.hardware.wifi.V1_3.IWifiChip iWifiChipV13 = getWifiChipForV1_3Mockable();
                 android.hardware.wifi.V1_5.IWifiChip iWifiChipV15 = getWifiChipForV1_5Mockable();
@@ -1561,7 +1560,7 @@
                 } else if (mIWifiChip != null) {
                     mIWifiChip.getCapabilities((status, capabilities) -> {
                         if (!ok(status)) return;
-                        feat.value = wifiFeatureMaskFromChipCapabilities(capabilities);
+                        feat.value = (long) wifiFeatureMaskFromChipCapabilities(capabilities);
                     });
                 }