packages_apps_Settings/src/com/android/settings/wifi/WifiConfigController.java, branch replicant-6.0

Merge branch 'LA.BF64.1.2.2_rb4.7' of git://codeaurora.org/platform/packages/apps/Settings into cm-13.0

2015-11-16T22:43:08+00:00

Wifi: Select SIMcard number based on index instead of displayname

2015-11-06T06:22:28+00:00

The selected SIMcard number is saved to configuration based on display
names, while doing EAP authentication using SIM/AKA/AKAPRIME. This leads
to selecting wrong SIMcard number if the display names of SIM cards are
same.This commit ensures to select SIMcard number based on index instead
of SIM display names.

Change-Id: Ic48af29428b49b9302cd136aae6bf88aa53521bc
CRs-Fixed: 934268

Merge tag 'android-6.0.0_r26' into HEAD

2015-11-05T15:44:26+00:00

Android 6.0.0 release 26

Conflicts:
	res/values-fr/strings.xml
	res/values-it/strings.xml
	res/values-ja/strings.xml
	res/values-nl/strings.xml
	res/values-pl/strings.xml
	res/values-ro/strings.xml
	res/values-ru/strings.xml
	res/values-zh-rCN/strings.xml
	res/values/bools.xml
	res/values/strings.xml
	res/xml/development_prefs.xml
	src/com/android/settings/DevelopmentSettings.java
	src/com/android/settings/DeviceInfoSettings.java
	src/com/android/settings/DisplaySettings.java

Change-Id: I9fd9e793cf6097d950f8a1e30771c8bdf5067906

Wifi: Handle NullPointerException during AddNetwork for EAP types

2015-10-21T20:24:15+00:00

While we do AddNetwork for EAP type - SIM/AKA/AKAPRIME
,NullPointerException is observed .Handle this by adding a null check
for the Accesspoint object.

Change-Id: I6d20eaa5ab734f11bfa5e038d894cb8ead07f204
CRs-Fixed: 923371

Wifi: Enhance EAP SIM/AKA/AKA` configuration for multi(dual ) sim

2015-10-06T09:21:21+00:00

This commit enhances the user interface by having the provision to
perform EAP authentication on a specific SIM , when the DUT is enabled
with multi (dual) SIM.

Change-Id: I4095d235750c2a46ab33a99f5f4f3937b6d5e314
CRs-Fixed: 905749

Avoid sending identity along with EAP sim, aka & aka'.

2015-08-12T01:42:36+00:00

Bug: 22358498
Change-Id: I829b3f9fe688efc933483506e1b5944195e1975f

Fix issues in AP dialog arising after clicking on AP preferences.

2015-07-24T20:52:03+00:00

+Added a new flag to keep track if user wanted to modify AP by hard
pressing on AP.

Bug: 22485686
Change-Id: Ia60a564a5344393f5e5340a3493ae7c660ead3d7

Disable CA certificate for EAP-SIM, AKA & AKA'

2015-07-06T23:14:43+00:00

Bug: 21877800
Change-Id: I66dbb12ebcf94c094d2a71d91d8b2eeef8cf6f48

Merge "Hide EAP SIM, AKA & AKA' choices in wifi Settings if device doesn't support." into mnc-dev

2015-06-28T02:45:48+00:00

Hide EAP SIM, AKA & AKA' choices in wifi Settings if device doesn't support.

2015-06-26T22:57:43+00:00

Bug: 22014309
Change-Id: I606649cb4d2e13330afa89075ad074e7dc525f87