summaryrefslogtreecommitdiff
path: root/cmds/svc
diff options
context:
space:
mode:
author Takashi Furukawa <takashi.x.furukawa@sony.com> 2017-07-12 16:32:01 +0900
committer Tomonori Nanbu <tomonori.nanbu@sonymobile.com> 2017-07-27 10:40:01 +0900
commit7ba244d6d8cf18b155422f6155765b5c874b3956 (patch)
tree623493686c2fbf27de540241754bdc9debe52240 /cmds/svc
parented3e6d47ffa3be00b7dadc4ac82ae5c3d49b0146 (diff)
Add null check for Wi-Fi command
When WifiService is not ready during boot phase and Wi-Fi command is executed on console, NullPointerException happens. To prevent this, null check is needed. Test: Manual test Bug: 64040515 Change-Id: I5684cdc7661b7d93fd6f2ac61863919077d12935
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);
}