diff options
author | Irfan Sheriff <isheriff@google.com> | 2010-01-07 10:53:52 -0800 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-01-07 10:53:52 -0800 |
commit | 567c44814f558bed906a6cf77f7471f2e41419ce (patch) | |
tree | b50141810eb24b0659e13c0cd1bc099bd6a8d134 | |
parent | 35351faed3589813524f8951ab46c36cef9b505d (diff) | |
parent | 94a9f0a4ab87baaca1ed1078be27a8c9fdb40d87 (diff) | |
download | packages_apps_settings-567c44814f558bed906a6cf77f7471f2e41419ce.zip packages_apps_settings-567c44814f558bed906a6cf77f7471f2e41419ce.tar.gz packages_apps_settings-567c44814f558bed906a6cf77f7471f2e41419ce.tar.bz2 |
Merge "Do a null check on setting an AP as configured"
-rw-r--r-- | src/com/android/settings/wifi/AccessPointDialog.java | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/com/android/settings/wifi/AccessPointDialog.java b/src/com/android/settings/wifi/AccessPointDialog.java index 69fad0f..bf9a471 100644 --- a/src/com/android/settings/wifi/AccessPointDialog.java +++ b/src/com/android/settings/wifi/AccessPointDialog.java @@ -632,8 +632,14 @@ public class AccessPointDialog extends AlertDialog implements DialogInterface.On updateEnterpriseFields(); } - /* AP state on the current scan list needs update to enable "Forget" capability */ - mWifiLayer.getWifiLayerApInstance(mState).setConfigured(true); + /** + * AP state on the current scan list needs update to enable "Forget" capability. + * This is not required for newly added APs. + */ + AccessPointState ap = mWifiLayer.getWifiLayerApInstance(mState); + if(ap != null) { + ap.setConfigured(true); + } if (!mWifiLayer.saveNetwork(mState)) { return; |