diff options
| author | Irfan Sheriff <isheriff@android.com> | 2013-01-24 16:15:29 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-01-24 16:15:29 -0800 |
| commit | 526603b1d8404432256b03507187f50c6b21b31d (patch) | |
| tree | 9fbea990acfe84dae5b8a7310713ac16d5cdbce0 /wifi | |
| parent | 377fc095e142b160b5093ed1d3717d0b18aff0f9 (diff) | |
| parent | 441a90dc72d05082f0d1a4b227d48420a0b99a54 (diff) | |
| download | frameworks_base-526603b1d8404432256b03507187f50c6b21b31d.zip frameworks_base-526603b1d8404432256b03507187f50c6b21b31d.tar.gz frameworks_base-526603b1d8404432256b03507187f50c6b21b31d.tar.bz2 | |
am 441a90dc: am 3a0acc03: am 381fb8bd: Merge "Fix WPS configuration method of BSS enrollee."
# By Yoshihiko Ikenaga
# Via Android Git Automerger (2) and others
* commit '441a90dc72d05082f0d1a4b227d48420a0b99a54':
Fix WPS configuration method of BSS enrollee.
Diffstat (limited to 'wifi')
| -rw-r--r-- | wifi/java/android/net/wifi/WifiStateMachine.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/wifi/java/android/net/wifi/WifiStateMachine.java b/wifi/java/android/net/wifi/WifiStateMachine.java index 0a61972..476ebbc 100644 --- a/wifi/java/android/net/wifi/WifiStateMachine.java +++ b/wifi/java/android/net/wifi/WifiStateMachine.java @@ -2315,7 +2315,7 @@ public class WifiStateMachine extends StateMachine { if (!mWifiNative.setSerialNumber(detail)) { loge("Failed to set serial number " + detail); } - if (!mWifiNative.setConfigMethods("physical_display virtual_push_button keypad")) { + if (!mWifiNative.setConfigMethods("physical_display virtual_push_button")) { loge("Failed to set WPS config methods"); } if (!mWifiNative.setDeviceType(mPrimaryDeviceType)) { |