Merge changes Icafa6c9b,Ic6b21ba7,I400557de

* changes:
  wifi(hal): Use @SystemApi IHwBinder.DeathRecipient
  WifiMetrics: Don't use @hide IntDef for mgmt frame error code
  wifi: Use @SystemApi UserHandle.SYSTEM

7 files changed, 18 insertions, 19 deletions

diff --git a/service/java/com/android/server/wifi/ConfigurationMap.java b/service/java/com/android/server/wifi/ConfigurationMap.java
index f8cae6695..1f21891e3 100644
--- a/service/java/com/android/server/wifi/ConfigurationMap.java
+++ b/service/java/com/android/server/wifi/ConfigurationMap.java
@@ -35,7 +35,7 @@ public class ConfigurationMap {
 
     private final UserManager mUserManager;
 
-    private int mCurrentUserId = UserHandle.USER_SYSTEM;
+    private int mCurrentUserId = UserHandle.SYSTEM.getIdentifier();
 
     ConfigurationMap(UserManager userManager) {
         mUserManager = userManager;
diff --git a/service/java/com/android/server/wifi/HalDeviceManager.java b/service/java/com/android/server/wifi/HalDeviceManager.java
index 990e1a45d..4ad6e2c36 100644
--- a/service/java/com/android/server/wifi/HalDeviceManager.java
+++ b/service/java/com/android/server/wifi/HalDeviceManager.java
@@ -35,7 +35,7 @@ import android.hardware.wifi.V1_0.WifiStatusCode;
 import android.hidl.manager.V1_0.IServiceNotification;
 import android.hidl.manager.V1_2.IServiceManager;
 import android.os.Handler;
-import android.os.HwRemoteBinder;
+import android.os.IHwBinder.DeathRecipient;
 import android.os.RemoteException;
 import android.util.Log;
 import android.util.LongSparseArray;
@@ -637,7 +637,7 @@ public class HalDeviceManager {
         mRttControllerLifecycleCallbacks.clear();
     }
 
-    private class ServiceManagerDeathRecipient implements HwRemoteBinder.DeathRecipient {
+    private class ServiceManagerDeathRecipient implements DeathRecipient {
         @Override
         public void serviceDied(long cookie) {
             mEventHandler.post(() -> {
@@ -728,7 +728,7 @@ public class HalDeviceManager {
         }
     }
 
-    private class WifiDeathRecipient implements HwRemoteBinder.DeathRecipient {
+    private class WifiDeathRecipient implements DeathRecipient {
         @Override
         public void serviceDied(long cookie) {
             mEventHandler.post(() -> {
diff --git a/service/java/com/android/server/wifi/HostapdHal.java b/service/java/com/android/server/wifi/HostapdHal.java
index bac04c62b..c246f0f10 100644
--- a/service/java/com/android/server/wifi/HostapdHal.java
+++ b/service/java/com/android/server/wifi/HostapdHal.java
@@ -29,7 +29,7 @@ import android.net.MacAddress;
 import android.net.wifi.SoftApConfiguration;
 import android.net.wifi.SoftApConfiguration.BandType;
 import android.os.Handler;
-import android.os.HwRemoteBinder;
+import android.os.IHwBinder.DeathRecipient;
 import android.os.RemoteException;
 import android.text.TextUtils;
 import android.util.Log;
@@ -100,7 +100,7 @@ public class HostapdHal {
             }
         }
     };
-    private class ServiceManagerDeathRecipient implements HwRemoteBinder.DeathRecipient {
+    private class ServiceManagerDeathRecipient implements DeathRecipient {
         @Override
         public void serviceDied(long cookie) {
             mEventHandler.post(() -> {
@@ -112,7 +112,7 @@ public class HostapdHal {
             });
         }
     }
-    private class HostapdDeathRecipient implements HwRemoteBinder.DeathRecipient {
+    private class HostapdDeathRecipient implements DeathRecipient {
         @Override
         public void serviceDied(long cookie) {
             mEventHandler.post(() -> {
@@ -257,7 +257,7 @@ public class HostapdHal {
      * Link to death for IHostapd object.
      * @return true on success, false otherwise.
      */
-    private boolean linkToHostapdDeath(HwRemoteBinder.DeathRecipient deathRecipient, long cookie) {
+    private boolean linkToHostapdDeath(DeathRecipient deathRecipient, long cookie) {
         synchronized (mLock) {
             if (mIHostapd == null) return false;
             try {
diff --git a/service/java/com/android/server/wifi/SupplicantStaIfaceHal.java b/service/java/com/android/server/wifi/SupplicantStaIfaceHal.java
index de2095550..7cd1a4441 100644
--- a/service/java/com/android/server/wifi/SupplicantStaIfaceHal.java
+++ b/service/java/com/android/server/wifi/SupplicantStaIfaceHal.java
@@ -43,7 +43,7 @@ import android.hidl.manager.V1_0.IServiceNotification;
 import android.net.wifi.ScanResult;
 import android.net.wifi.WifiConfiguration;
 import android.os.Handler;
-import android.os.HwRemoteBinder;
+import android.os.IHwBinder.DeathRecipient;
 import android.os.RemoteException;
 import android.text.TextUtils;
 import android.util.Log;
@@ -137,7 +137,7 @@ public class SupplicantStaIfaceHal {
             }
         }
     };
-    private class ServiceManagerDeathRecipient implements HwRemoteBinder.DeathRecipient {
+    private class ServiceManagerDeathRecipient implements DeathRecipient {
         @Override
         public void serviceDied(long cookie) {
             mEventHandler.post(() -> {
@@ -149,7 +149,7 @@ public class SupplicantStaIfaceHal {
             });
         }
     }
-    private class SupplicantDeathRecipient implements HwRemoteBinder.DeathRecipient {
+    private class SupplicantDeathRecipient implements DeathRecipient {
         @Override
         public void serviceDied(long cookie) {
             mEventHandler.post(() -> {
@@ -263,7 +263,7 @@ public class SupplicantStaIfaceHal {
     }
 
     private boolean linkToSupplicantDeath(
-            HwRemoteBinder.DeathRecipient deathRecipient, long cookie) {
+            DeathRecipient deathRecipient, long cookie) {
         synchronized (mLock) {
             if (mISupplicant == null) return false;
             try {
diff --git a/service/java/com/android/server/wifi/WifiConfigManager.java b/service/java/com/android/server/wifi/WifiConfigManager.java
index 541448efe..0647ed987 100644
--- a/service/java/com/android/server/wifi/WifiConfigManager.java
+++ b/service/java/com/android/server/wifi/WifiConfigManager.java
@@ -295,7 +295,7 @@ public class WifiConfigManager {
     /**
      * Current logged in user ID.
      */
-    private int mCurrentUserId = UserHandle.USER_SYSTEM;
+    private int mCurrentUserId = UserHandle.SYSTEM.getIdentifier();
     /**
      * Flag to indicate that the new user's store has not yet been read since user switch.
      * Initialize this flag to |true| to trigger a read on the first user unlock after
diff --git a/service/java/com/android/server/wifi/WifiMetrics.java b/service/java/com/android/server/wifi/WifiMetrics.java
index 1a0a13d35..c0b47f593 100644
--- a/service/java/com/android/server/wifi/WifiMetrics.java
+++ b/service/java/com/android/server/wifi/WifiMetrics.java
@@ -3403,8 +3403,7 @@ public class WifiMetrics {
         }
     }
 
-    private static int linkProbeFailureReasonToProto(
-            @WifiCondManager.SendMgmtFrameError int reason) {
+    private static int linkProbeFailureReasonToProto(int reason) {
         switch (reason) {
             case WifiCondManager.SEND_MGMT_FRAME_ERROR_MCS_UNSUPPORTED:
                 return LinkProbeStats.LINK_PROBE_FAILURE_REASON_MCS_UNSUPPORTED;
@@ -4748,7 +4747,7 @@ public class WifiMetrics {
      * @param reason The error code for the failure. See {@link WifiCondManager.SendMgmtFrameError}.
      */
     public void logLinkProbeFailure(long timeSinceLastTxSuccessMs,
-            int rssi, int linkSpeed, @WifiCondManager.SendMgmtFrameError int reason) {
+            int rssi, int linkSpeed, int reason) {
         synchronized (mLock) {
             mProbeStatusSinceLastUpdate =
                     android.net.wifi.WifiUsabilityStatsEntry.PROBE_STATUS_FAILURE;
diff --git a/service/java/com/android/server/wifi/p2p/SupplicantP2pIfaceHal.java b/service/java/com/android/server/wifi/p2p/SupplicantP2pIfaceHal.java
index c48a6c358..5afc4788f 100644
--- a/service/java/com/android/server/wifi/p2p/SupplicantP2pIfaceHal.java
+++ b/service/java/com/android/server/wifi/p2p/SupplicantP2pIfaceHal.java
@@ -36,7 +36,7 @@ import android.net.wifi.p2p.WifiP2pGroup;
 import android.net.wifi.p2p.WifiP2pGroupList;
 import android.net.wifi.p2p.WifiP2pManager;
 import android.net.wifi.p2p.nsd.WifiP2pServiceInfo;
-import android.os.HwRemoteBinder;
+import android.os.IHwBinder.DeathRecipient;
 import android.os.RemoteException;
 import android.text.TextUtils;
 import android.util.Log;
@@ -96,7 +96,7 @@ public class SupplicantP2pIfaceHal {
             }
         }
     };
-    private final HwRemoteBinder.DeathRecipient mServiceManagerDeathRecipient =
+    private final DeathRecipient mServiceManagerDeathRecipient =
             cookie -> {
                 Log.w(TAG, "IServiceManager died: cookie=" + cookie);
                 synchronized (mLock) {
@@ -104,7 +104,7 @@ public class SupplicantP2pIfaceHal {
                     mIServiceManager = null; // Will need to register a new ServiceNotification
                 }
             };
-    private final HwRemoteBinder.DeathRecipient mSupplicantDeathRecipient =
+    private final DeathRecipient mSupplicantDeathRecipient =
             cookie -> {
                 Log.w(TAG, "ISupplicant/ISupplicantStaIface died: cookie=" + cookie);
                 synchronized (mLock) {