summaryrefslogtreecommitdiffstats
path: root/services/java
diff options
context:
space:
mode:
authorIrfan Sheriff <isheriff@google.com>2012-03-02 16:33:01 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-03-02 16:33:01 -0800
commitdb9e6937f18ceeb5715954c828ac4a51e383d140 (patch)
tree38b6165086408ed99e54fbca8e8ac93ac3b9e0f5 /services/java
parent86add4350c228a9a33c71d695098ea8ba7c7c275 (diff)
parent86a5f5b9afa97a4ed6f5a2466fb9359ea131e2fb (diff)
downloadframeworks_base-db9e6937f18ceeb5715954c828ac4a51e383d140.zip
frameworks_base-db9e6937f18ceeb5715954c828ac4a51e383d140.tar.gz
frameworks_base-db9e6937f18ceeb5715954c828ac4a51e383d140.tar.bz2
Merge "Enhance WPS"
Diffstat (limited to 'services/java')
-rw-r--r--services/java/com/android/server/WifiService.java4
1 files changed, 4 insertions, 0 deletions
diff --git a/services/java/com/android/server/WifiService.java b/services/java/com/android/server/WifiService.java
index 6b4c895..8363e6e 100644
--- a/services/java/com/android/server/WifiService.java
+++ b/services/java/com/android/server/WifiService.java
@@ -297,6 +297,10 @@ public class WifiService extends IWifiManager.Stub {
mWifiStateMachine.sendMessage(Message.obtain(msg));
break;
}
+ case WifiManager.CANCEL_WPS: {
+ mWifiStateMachine.sendMessage(Message.obtain(msg));
+ break;
+ }
case WifiManager.DISABLE_NETWORK: {
mWifiStateMachine.sendMessage(Message.obtain(msg));
break;