PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am eb7836f1: Apply the new keystore and certtool library in Wifi setting.

Browse Source 
Merge commit 'eb7836f11ec4e9753db7c6ecd9414e153bb7bdbe'

* commit 'eb7836f11ec4e9753db7c6ecd9414e153bb7bdbe':
  Apply the new keystore and certtool library in Wifi setting.
This commit is contained in:
Chung-yih Wang
2009-07-06 11:22:32 -07:00
committed by The Android Open Source Project
parent acedb4b501 eb7836f11e
commit bd7f05701a
4 changed files with 123 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/com/android/settings/wifi/WifiSettings.java
View File

@@ -18,6 +18,7 @@ package com.android.settings.wifi;
import com.android.settings.ProgressCategory;
import com.android.settings.R;
import com.android.settings.SecuritySettings;
import android.app.Dialog;
import android.content.DialogInterface;
@@ -29,6 +30,7 @@ import android.preference.PreferenceActivity;
import android.preference.PreferenceScreen;
import android.preference.CheckBoxPreference;
import android.provider.Settings;
import android.security.Keystore;
import android.util.Log;
import android.view.ContextMenu;
import android.view.Menu;
@@ -259,7 +261,7 @@ public class WifiSettings extends PreferenceActivity implements WifiLayer.Callba
@Override
public boolean onContextItemSelected(MenuItem item) {
AccessPointState state = getStateFromMenuInfo(item.getMenuInfo());
if (state == null) {
return false;
@@ -352,6 +354,12 @@ public class WifiSettings extends PreferenceActivity implements WifiLayer.Callba
}
public void showAccessPointDialog(AccessPointState state, int mode) {
if (state.isEnterprise() &&
Keystore.getInstance().getState() != Keystore.UNLOCKED) {
startActivity(new Intent(
SecuritySettings.ACTION_UNLOCK_CREDENTIAL_STORAGE));
return;
}
AccessPointDialog dialog = new AccessPointDialog(this, mWifiLayer);
dialog.setMode(mode);
dialog.setState(state);