Commit Graph

32 Commits

Author SHA1 Message Date
Chia-chi Yeh
28f1a0fc5b WifiSettings: use keystore namespace instead of blobl. 2009-10-01 19:17:55 +08:00
Chia-chi Yeh
fc0139aa28 WifiSettings: use Credentials instead of CertTool. 2009-09-22 23:44:17 +08:00
Chung-yih Wang
98f447fe2d Aggregate the security settings for WiFi network configuration.
* Merge WPA and WPA2 PSK.
* Merge WPA-EAP and IEEE8021X.
* Remove unused field "private key password" in EAP configuration.
2009-09-16 15:34:32 +08:00
Hung-ying Tyan
f71c8b40b5 Add install-cert-from-sdcard in Security settings
Also:
* Resume keystore states in SecuritySettings.onResume().
* Use action strings defined in CertTool and Keystore.
2009-09-10 12:50:10 +08:00
Chung-yih Wang
844bb946af am c538b651: Fix some UI flow issues when the keystore is locked in WiFi setting.
Merge commit 'c538b651a23287ab25584995c6c4b7a68ece027c'

* commit 'c538b651a23287ab25584995c6c4b7a68ece027c':
  Fix some UI flow issues when the keystore is locked in WiFi setting.
2009-07-30 16:05:19 -07:00
Chung-yih Wang
c538b651a2 Fix some UI flow issues when the keystore is locked in WiFi setting.
To make it more user friendly, we need to continue on what
users intend to do after unlocking the credential storage.
2009-07-30 20:03:16 +08:00
Chung-yih Wang
c7343d12f3 am c78e0b01: Fix the broken build
Merge commit 'c78e0b01e6c4da1d8fecd5b6017a76f159066ea1'

* commit 'c78e0b01e6c4da1d8fecd5b6017a76f159066ea1':
  Fix the broken build
2009-07-22 11:51:12 -07:00
Chung-yih Wang
7073178985 am b2295174: Add the missing phase2 field in EAP configuration.
Merge commit 'b2295174dcb27efa0bf2fb58bb31a517413d9c86'

* commit 'b2295174dcb27efa0bf2fb58bb31a517413d9c86':
  Add the missing phase2 field in EAP configuration.
2009-07-22 11:51:10 -07:00
Chung-yih Wang
c78e0b01e6 Fix the broken build 2009-07-23 01:56:57 +08:00
Chung-yih Wang
b2295174dc Add the missing phase2 field in EAP configuration.
+ Enable the password field for configuring the EAP-APs scanned.
2009-07-22 11:48:33 +08:00
Android (Google) Code Review
fbd3f36a4c am c4a3bf94: Merge change 6345 into donut
Merge commit 'c4a3bf94cc870d940df37756ed2c5ea7067d00da'

* commit 'c4a3bf94cc870d940df37756ed2c5ea7067d00da':
  Add header 'blob://' in front of the cert/key names in wpa_supplicant.conf.
2009-07-07 07:08:40 -07:00
Chung-yih Wang
242096832b Add header 'blob://' in front of the cert/key names in wpa_supplicant.conf.
1. This addition is from CL 6082 change in wpa_supplicant.
2. Fix the empty password pop-up for EAP.
2009-07-07 21:58:13 +08:00
Chung-yih Wang
bd7f05701a am eb7836f1: Apply the new keystore and certtool library in Wifi setting.
Merge commit 'eb7836f11ec4e9753db7c6ecd9414e153bb7bdbe'

* commit 'eb7836f11ec4e9753db7c6ecd9414e153bb7bdbe':
  Apply the new keystore and certtool library in Wifi setting.
2009-07-06 11:22:32 -07:00
Chung-yih Wang
eb7836f11e Apply the new keystore and certtool library in Wifi setting.
1. Certificate related APIs were moved to CertTool. Therefore,
   we have to migrate to CertTool instead.
2. Unlock the keystore if it is not unlocked yet(send the intent
   out to credential storage) for EAP access points.
3. Add Password field for WPA_EAP and IEEE8021X(this is for
   phase 2 auth.)
2009-07-06 17:03:53 +08:00
Chung-yih Wang
420586fd90 am b2f1c334: Simply the EAP certificate selection in Wifi Setting.
Merge commit 'b2f1c334de30b2185bec53af81984d015436f610'

* commit 'b2f1c334de30b2185bec53af81984d015436f610':
  Simply the EAP certificate selection in Wifi Setting.
2009-06-17 15:38:30 -07:00
Chung-yih Wang
b2f1c334de Simply the EAP certificate selection in Wifi Setting.
-- use the new keystore APU to save one more selection in WiFi EAP setting.
2009-06-17 15:46:42 +08:00
Chung-yih Wang
1bac55d785 am 150d5d84: Use the keystore service instead of the direct file access.
Merge commit '150d5d84e8913e93402950a84ff991b7549b71b4'

* commit '150d5d84e8913e93402950a84ff991b7549b71b4':
  Use the keystore service instead of the direct file access.
2009-06-12 08:25:48 -07:00
Chung-yih Wang
150d5d84e8 Use the keystore service instead of the direct file access.
Revert back to my merged change 3710.
2009-06-12 08:16:26 +08:00
Chung-yih Wang
24b17de66c am e7e587da: Revert "Use the keystore service instead of the direct file acess."
Merge commit 'e7e587daf65ec39ca2b10e5c6a03f6bb0b4ccce0'

* commit 'e7e587daf65ec39ca2b10e5c6a03f6bb0b4ccce0':
  Revert "Use the keystore service instead of the direct file acess."
2009-06-11 07:57:48 -07:00
Chung-yih Wang
17f69c88f5 am e97bfa3c: Fix the bug of missing EAP setting in wpa_supplicant.conf when a new EAP is configured.
Merge commit 'e97bfa3c2581bc59eceaaf043b7059dc29307884'

* commit 'e97bfa3c2581bc59eceaaf043b7059dc29307884':
  Fix the bug of missing EAP setting in wpa_supplicant.conf when a new EAP is configured.
2009-06-11 07:57:39 -07:00
Chung-yih Wang
a0f6d64dbc am 289705f3: Use the keystore service instead of the direct file acess.
Merge commit '289705f3311932a45adef1710358f5e302115013'

* commit '289705f3311932a45adef1710358f5e302115013':
  Use the keystore service instead of the direct file acess.
2009-06-11 07:57:34 -07:00
Chung-yih Wang
e7e587daf6 Revert "Use the keystore service instead of the direct file acess."
This reverts commit 289705f331.
2009-06-11 18:13:49 +08:00
Chung-yih Wang
e97bfa3c25 Fix the bug of missing EAP setting in wpa_supplicant.conf when a new EAP is configured. 2009-06-11 17:56:04 +08:00
Chung-yih Wang
289705f331 Use the keystore service instead of the direct file acess.
-- removed the temporal Keystore.java.
-- added the empty passphrase for private key.
2009-06-11 17:25:49 +08:00
Chung-yih Wang
380db9021c am 0c1f8985: Add EAP/802.1X configuration for WiFi Setting.
Merge commit '0c1f89857a730f9f75312fce39ff65c2f01e7d22'

* commit '0c1f89857a730f9f75312fce39ff65c2f01e7d22':
  Add EAP/802.1X configuration for WiFi Setting.
2009-06-08 19:17:02 -07:00
Chung-yih Wang
0c1f89857a Add EAP/802.1X configuration for WiFi Setting.
1. Remove the isEnterprise() filter in Scanresult.
2. This requires the new fields such as identity, eap, certificate/key
to support EAP authentication in Wifi Settings.
3. Add simple file-based keystore to select the cert/key from UI.

-- Updated from the comments.
-- Fix the bug for passing null pointer for adding spinner items.
2009-06-09 10:11:11 +08:00
Michael Chan
8762093e00 Findbug fixes in Settings app
modified:   src/com/android/settings/ApnPreference.java
	modified:   src/com/android/settings/ApnSettings.java
	modified:   src/com/android/settings/BandMode.java
	modified:   src/com/android/settings/BatteryInfo.java
	modified:   src/com/android/settings/LanguageSettings.java
	modified:   src/com/android/settings/ManageApplications.java
	modified:   src/com/android/settings/RadioInfo.java
	modified:   src/com/android/settings/SdCardSettings.java
	modified:   src/com/android/settings/UsageStats.java
	modified:   src/com/android/settings/ZoneList.java
	modified:   src/com/android/settings/bluetooth/LocalBluetoothDevice.java
	modified:   src/com/android/settings/deviceinfo/Status.java
	modified:   src/com/android/settings/quicklaunch/QuickLaunchSettings.java
	modified:   src/com/android/settings/wifi/AccessPointDialog.java
	modified:   src/com/android/settings/wifi/AccessPointPreference.java
	modified:   src/com/android/settings/wifi/WifiLayer.java
	modified:   src/com/android/settings/wifi/WifiSettings.java
2009-05-14 17:47:02 -07:00
The Android Open Source Project
86997beac8 auto import from //depot/cupcake/@136594 2009-03-05 14:34:39 -08:00
The Android Open Source Project
afc4ab2ffb auto import from //depot/cupcake/@135843 2009-03-03 19:32:34 -08:00
The Android Open Source Project
4e14e5ccbf auto import from //depot/cupcake/@135843 2009-03-03 18:28:52 -08:00
The Android Open Source Project
abc48f80d8 Code drop from //branches/cupcake/...@124589 2008-12-17 18:06:01 -08:00
The Android Open Source Project
de2d9f5f10 Initial Contribution 2008-10-21 07:00:00 -07:00