commit 3a84970edae8bed47c5b79623f471c2920c7ec91
author Rebecca Silberstein <silberst@google.com> Thu Jan 19 23:48:54 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Jan 19 23:48:54 2017 +0000
tree d2eb2b977792e227c03a324175160a5bf45e361c
parent b32f7d6a3d4339d20bc73ab4853d9a4fc5ec9e2e
parent 927460f9dcedc9167acb5591726887d1a0af4ba5

Merge "WifiStateMachine: check p2p supported"

service/java/com/android/server/wifi/WifiStateMachine.java

diff --git a/service/java/com/android/server/wifi/WifiStateMachine.java b/service/java/com/android/server/wifi/WifiStateMachine.java
index 5786d8b..e26eab6 100644
--- a/service/java/com/android/server/wifi/WifiStateMachine.java
+++ b/service/java/com/android/server/wifi/WifiStateMachine.java
@@ -3654,15 +3654,16 @@
      */
     private void getAdditionalWifiServiceInterfaces() {
         // First set up Wifi Direct
-        // TODO: b/34193861 determine if we can avoid starting WIFI_P2P_SERVICE when not supported
-        IBinder s1 = mFacade.getService(Context.WIFI_P2P_SERVICE);
-        WifiP2pServiceImpl wifiP2pServiceImpl =
-                (WifiP2pServiceImpl) IWifiP2pManager.Stub.asInterface(s1);
+        if (mP2pSupported) {
+            IBinder s1 = mFacade.getService(Context.WIFI_P2P_SERVICE);
+            WifiP2pServiceImpl wifiP2pServiceImpl =
+                    (WifiP2pServiceImpl) IWifiP2pManager.Stub.asInterface(s1);
 
-        if (wifiP2pServiceImpl != null) {
-            mWifiP2pChannel = new AsyncChannel();
-            mWifiP2pChannel.connect(mContext, getHandler(),
-                    wifiP2pServiceImpl.getP2pStateMachineMessenger());
+            if (wifiP2pServiceImpl != null) {
+                mWifiP2pChannel = new AsyncChannel();
+                mWifiP2pChannel.connect(mContext, getHandler(),
+                        wifiP2pServiceImpl.getP2pStateMachineMessenger());
+            }
         }
 
         // Set up Wifi Aware