Merge "Cherry-pick: Add null check for Wi-Fi command" into oc-mr1-dev

2017-08-08 18:23:52 +00:00
parent 3102245b62 1aa263e5ab
commit 552d35cb4f
1 changed files with 4 additions and 0 deletions
--- 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);
                }