summaryrefslogtreecommitdiff
path: root/cmds/svc
diff options
context:
space:
mode:
authorTakashi Furukawa <takashi.x.furukawa@sony.com>2017-08-08 18:14:53 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-08-08 18:14:53 +0000
commit51e24de10980655f5d09b45351b6b3beb72bc848 (patch)
treec09c9e6aab2bea7c8dadde9a95d9f03804ad1eef /cmds/svc
parent8a9e43f1bf9b8ea1672981022f3486bb436f7c44 (diff)
parent43ee2ac1407770d862c09c78b10d2da5a8ed4975 (diff)
Merge "Add null check for Wi-Fi command"
am: 43ee2ac140 Change-Id: Ideddbcd85dc15012f405138c358f3dd8c516eef5
Diffstat (limited to 'cmds/svc')
-rw-r--r--cmds/svc/src/com/android/commands/svc/WifiCommand.java4
1 files changed, 4 insertions, 0 deletions
diff --git a/cmds/svc/src/com/android/commands/svc/WifiCommand.java b/cmds/svc/src/com/android/commands/svc/WifiCommand.java
index 633dd9787cb1..e31cb5381afc 100644
--- a/cmds/svc/src/com/android/commands/svc/WifiCommand.java
+++ b/cmds/svc/src/com/android/commands/svc/WifiCommand.java
@@ -51,6 +51,10 @@ public class WifiCommand extends Svc.Command {
if (validCommand) {
IWifiManager wifiMgr
= IWifiManager.Stub.asInterface(ServiceManager.getService(Context.WIFI_SERVICE));
+ if (wifiMgr == null) {
+ System.err.println("Wi-Fi service is not ready");
+ return;
+ }
try {
wifiMgr.setWifiEnabled("com.android.shell", flag);
}