diff options
| author | Takashi Furukawa <takashi.x.furukawa@sony.com> | 2017-07-12 16:32:01 +0900 |
|---|---|---|
| committer | Ningyuan Wang <nywang@google.com> | 2017-08-07 13:27:56 -0700 |
| commit | 1aa263e5abc391d97e0356a5379d9fdd4e94921b (patch) | |
| tree | c58971cda6551e638a9a94fbe1b6857b5cc061c9 /cmds/svc/src | |
| parent | 62e72c21f52dcdf2de7e9e189a5d81826e70f3cf (diff) | |
Cherry-pick: 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
Merged-In: I5684cdc7661b7d93fd6f2ac61863919077d12935
Diffstat (limited to 'cmds/svc/src')
| -rw-r--r-- | cmds/svc/src/com/android/commands/svc/WifiCommand.java | 4 |
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); } |