From 5e15429d8a269d328d1d57d74b1144e5c51efd15 Mon Sep 17 00:00:00 2001 From: Roshan Pius Date: Mon, 4 May 2020 15:05:24 -0700 Subject: SupplicantStaIfaceHalCallback: Remove unnecessary dependency There is no need for SupplicantStaIfaceCallbackV1_3Impl to depend on SupplicantStaIfaceCallbackV1_0Impl. We just need to import the static helper method used. Bug: 135503681 Test: Compiles Change-Id: I3760e69732d9dfbeecc2f2a86ea285a18096c23b --- .../com/android/server/wifi/SupplicantStaIfaceCallbackV1_3Impl.java | 6 +++--- 1 file 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 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); -- cgit v1.2.3