diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-05-05 15:24:40 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-05-05 15:24:40 +0000 |
| commit | e22825db8cb79bfa757a498629b1768815c57b0b (patch) | |
| tree | 4989427f968b9c8116d6ad0386478397f3c5ba94 | |
| parent | 64f1ba7c05c5b56a97df0996647b1618b2cbe53c (diff) | |
| parent | 74eb8daa7af2c47fed5b6c90ee407fe652158943 (diff) | |
Merge "SupplicantStaIfaceHalCallback: Remove unnecessary dependency" into rvc-dev am: 4d68b0507e am: 74eb8daa7a
Change-Id: I78fd3d6897738a3b12c9822ef23e4d2da02174bc
| -rw-r--r-- | service/java/com/android/server/wifi/SupplicantStaIfaceCallbackV1_3Impl.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/service/java/com/android/server/wifi/SupplicantStaIfaceCallbackV1_3Impl.java b/service/java/com/android/server/wifi/SupplicantStaIfaceCallbackV1_3Impl.java index cac84b543..596b56d57 100644 --- a/service/java/com/android/server/wifi/SupplicantStaIfaceCallbackV1_3Impl.java +++ b/service/java/com/android/server/wifi/SupplicantStaIfaceCallbackV1_3Impl.java @@ -15,6 +15,8 @@ */ package com.android.server.wifi; +import static com.android.server.wifi.SupplicantStaIfaceCallbackImpl.supplicantHidlStateToFrameworkState; + import android.annotation.NonNull; import android.hardware.wifi.supplicant.V1_0.ISupplicantStaIfaceCallback; import android.hardware.wifi.supplicant.V1_3.ISupplicantStaIfaceCallback.BssTmData; @@ -34,7 +36,6 @@ abstract class SupplicantStaIfaceCallbackV1_3Impl extends private final SupplicantStaIfaceHal mStaIfaceHal; private final String mIfaceName; private final WifiMonitor mWifiMonitor; - private final SupplicantStaIfaceHal.SupplicantStaIfaceHalCallback mCallbackV10; private final SupplicantStaIfaceHal.SupplicantStaIfaceHalCallbackV1_2 mCallbackV12; private boolean mStateIsFourwayV13 = false; // Used to help check for PSK password mismatch @@ -47,7 +48,6 @@ abstract class SupplicantStaIfaceCallbackV1_3Impl extends // Create an older callback for function delegation, // and it would cascadingly create older one. mCallbackV12 = mStaIfaceHal.new SupplicantStaIfaceHalCallbackV1_2(mIfaceName); - mCallbackV10 = mStaIfaceHal.new SupplicantStaIfaceHalCallback(mIfaceName); } @Override @@ -367,7 +367,7 @@ abstract class SupplicantStaIfaceCallbackV1_3Impl extends ArrayList<Byte> ssid, boolean filsHlpSent) { mStaIfaceHal.logCallback("onStateChanged_1_3"); SupplicantState newSupplicantState = - mCallbackV10.supplicantHidlStateToFrameworkState(newState); + supplicantHidlStateToFrameworkState(newState); WifiSsid wifiSsid = WifiSsid.createFromByteArray(NativeUtil.byteArrayFromArrayList(ssid)); String bssidStr = NativeUtil.macAddressFromByteArray(bssid); |