From 7ba244d6d8cf18b155422f6155765b5c874b3956 Mon Sep 17 00:00:00 2001
From: Takashi Furukawa <takashi.x.furukawa@sony.com>
Date: Wed, 12 Jul 2017 16:32:01 +0900
Subject: 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
---
 cmds/svc/src/com/android/commands/svc/WifiCommand.java | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'cmds/svc')

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);
                 }
-- 
cgit v1.2.3-59-g8ed1b