diff options
| -rw-r--r-- | service/java/com/android/server/wifi/WifiServiceImpl.java | 2 | ||||
| -rw-r--r-- | service/java/com/android/server/wifi/WifiShellCommand.java | 18 |
2 files changed, 7 insertions, 13 deletions
diff --git a/service/java/com/android/server/wifi/WifiServiceImpl.java b/service/java/com/android/server/wifi/WifiServiceImpl.java index e8fae501b..afd0291fd 100644 --- a/service/java/com/android/server/wifi/WifiServiceImpl.java +++ b/service/java/com/android/server/wifi/WifiServiceImpl.java @@ -2843,7 +2843,7 @@ public class WifiServiceImpl extends BaseWifiService { public int handleShellCommand(@NonNull ParcelFileDescriptor in, @NonNull ParcelFileDescriptor out, @NonNull ParcelFileDescriptor err, @NonNull String[] args) { - return new WifiShellCommand(mWifiInjector).exec( + return new WifiShellCommand(mWifiInjector, this).exec( this, in.getFileDescriptor(), out.getFileDescriptor(), err.getFileDescriptor(), args); } diff --git a/service/java/com/android/server/wifi/WifiShellCommand.java b/service/java/com/android/server/wifi/WifiShellCommand.java index afbcba3c5..da207b561 100644 --- a/service/java/com/android/server/wifi/WifiShellCommand.java +++ b/service/java/com/android/server/wifi/WifiShellCommand.java @@ -16,14 +16,11 @@ package com.android.server.wifi; -import android.content.Context; -import android.net.wifi.IWifiManager; import android.net.wifi.SoftApConfiguration; import android.net.wifi.WifiScanner; import android.net.wifi.wificond.WifiCondManager; import android.os.BasicShellCommandHandler; import android.os.Binder; -import android.os.ServiceManager; import com.android.server.wifi.util.ApConfigUtil; @@ -55,8 +52,9 @@ public class WifiShellCommand extends BasicShellCommandHandler { private final HostapdHal mHostapdHal; private final WifiCountryCode mWifiCountryCode; private final WifiLastResortWatchdog mWifiLastResortWatchdog; + private final WifiServiceImpl mWifiService; - WifiShellCommand(WifiInjector wifiInjector) { + WifiShellCommand(WifiInjector wifiInjector, WifiServiceImpl wifiService) { mClientModeImpl = wifiInjector.getClientModeImpl(); mWifiLockManager = wifiInjector.getWifiLockManager(); mWifiNetworkSuggestionsManager = wifiInjector.getWifiNetworkSuggestionsManager(); @@ -65,6 +63,7 @@ public class WifiShellCommand extends BasicShellCommandHandler { mWifiNative = wifiInjector.getWifiNative(); mWifiCountryCode = wifiInjector.getWifiCountryCode(); mWifiLastResortWatchdog = wifiInjector.getWifiLastResortWatchdog(); + mWifiService = wifiService; } @Override @@ -214,13 +213,10 @@ public class WifiShellCommand extends BasicShellCommandHandler { return -1; } - // validate that device support this band - IWifiManager wifiManager = IWifiManager.Stub.asInterface( - ServiceManager.getService(Context.WIFI_SERVICE)); if ((band == SoftApConfiguration.BAND_5GHZ - && !wifiManager.is5GHzBandSupported()) + && !mWifiService.is5GHzBandSupported()) || (band == SoftApConfiguration.BAND_6GHZ - && !wifiManager.is6GHzBandSupported())) { + && !mWifiService.is6GHzBandSupported())) { pw.println("Invalid argument to 'force-softap-channel enabled' " + "- channel band is not supported by the device"); return -1; @@ -305,9 +301,7 @@ public class WifiShellCommand extends BasicShellCommandHandler { + " or 'disabled'"); return -1; } - IWifiManager wifiManager = IWifiManager.Stub.asInterface( - ServiceManager.getService(Context.WIFI_SERVICE)); - wifiManager.setWifiEnabled("com.android.shell", enabled); + mWifiService.setWifiEnabled("com.android.shell", enabled); return 0; } default: |