diff options
| author | Irfan Sheriff <isheriff@google.com> | 2012-09-24 14:21:54 -0700 |
|---|---|---|
| committer | Irfan Sheriff <isheriff@google.com> | 2012-09-25 14:44:00 -0700 |
| commit | c41096e1b4bf453c195c8c46c5d296f2125d31f6 (patch) | |
| tree | 29d7b0cfcbae7fa44b914c62d39d69dbe57fbce8 /wifi/java/android/net/wifi/WifiMonitor.java | |
| parent | a5e1d21f566c8df750d766c76f6a99432a703c5e (diff) | |
| download | frameworks_base-c41096e1b4bf453c195c8c46c5d296f2125d31f6.zip frameworks_base-c41096e1b4bf453c195c8c46c5d296f2125d31f6.tar.gz frameworks_base-c41096e1b4bf453c195c8c46c5d296f2125d31f6.tar.bz2 | |
P2p fixes
- Add wfdInfo details in group to allow display stack to filter
- Handle provision discovery failure and reset
- Do a discovery after group removal
- Handle failure to reinvoke and fall back to negotiation
- Avoid multiple REMOVE_GROUP calls that lead to removal
of persisted network
Bug: 7210856
Change-Id: Ia2e613e9b1191b919a185f0411439341e2e151bc
Diffstat (limited to 'wifi/java/android/net/wifi/WifiMonitor.java')
| -rw-r--r-- | wifi/java/android/net/wifi/WifiMonitor.java | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/wifi/java/android/net/wifi/WifiMonitor.java b/wifi/java/android/net/wifi/WifiMonitor.java index ab54a15..93ab4a4 100644 --- a/wifi/java/android/net/wifi/WifiMonitor.java +++ b/wifi/java/android/net/wifi/WifiMonitor.java @@ -217,6 +217,8 @@ public class WifiMonitor { pri_dev_type=1-0050F204-1 name='p2p-TEST2' config_methods=0x188 dev_capab=0x27 group_capab=0x0 */ private static final String P2P_PROV_DISC_SHOW_PIN_STR = "P2P-PROV-DISC-SHOW-PIN"; + /* P2P-PROV-DISC-FAILURE p2p_dev_addr=42:fc:89:e1:e2:27 */ + private static final String P2P_PROV_DISC_FAILURE_STR = "P2P-PROV-DISC-FAILURE"; /* * Protocol format is as follows.<br> @@ -319,6 +321,7 @@ public class WifiMonitor { public static final int P2P_PROV_DISC_SHOW_PIN_EVENT = BASE + 36; public static final int P2P_FIND_STOPPED_EVENT = BASE + 37; public static final int P2P_SERV_DISC_RESP_EVENT = BASE + 38; + public static final int P2P_PROV_DISC_FAILURE_EVENT = BASE + 39; /* hostap events */ public static final int AP_STA_DISCONNECTED_EVENT = BASE + 41; @@ -615,6 +618,8 @@ public class WifiMonitor { } else if (dataString.startsWith(P2P_PROV_DISC_SHOW_PIN_STR)) { mStateMachine.sendMessage(P2P_PROV_DISC_SHOW_PIN_EVENT, new WifiP2pProvDiscEvent(dataString)); + } else if (dataString.startsWith(P2P_PROV_DISC_FAILURE_STR)) { + mStateMachine.sendMessage(P2P_PROV_DISC_FAILURE_EVENT); } else if (dataString.startsWith(P2P_SERV_DISC_RESP_STR)) { List<WifiP2pServiceResponse> list = WifiP2pServiceResponse.newInstance(dataString); if (list != null) { |