diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-05-05 14:54:00 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-05-05 14:54:00 +0000 |
| commit | 4d68b0507ef4bede9fd8af1a93f0637e78b5fe6c (patch) | |
| tree | fa73da23bfd9e48704e131469d43d86f1f48f8b7 /service | |
| parent | ba11e15e53a42b7b703dd6c4c6d6527c9ca00006 (diff) | |
| parent | 5e15429d8a269d328d1d57d74b1144e5c51efd15 (diff) | |
Merge "SupplicantStaIfaceHalCallback: Remove unnecessary dependency" into rvc-dev
Diffstat (limited to 'service')
| -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); |