Commit Graph

9347 Commits

Author SHA1 Message Date
Elliott Hughes
02e23fb0eb Merge "Clamp date setting for the SetupWizard as well as Settings." 2013-06-25 16:53:21 +00:00
Elliott Hughes
b85d48fa43 Clamp date setting for the SetupWizard as well as Settings.
We fixed this for Settings in 7ccfa0614c,
but @sonymobile.com point out that it's still broken for SetupWizard.

Change-Id: I59348200105246f3ed7c0892e5f19b901d3e95ac
2013-06-24 17:24:01 -07:00
Jean-Baptiste Queru
8147640558 Merge "Settings: Fix Swedish translations" 2013-05-30 22:06:37 +00:00
Amith Yamasani
4abe488a5f Merge "No back icon in action bar of APN Settings" 2013-05-20 18:07:21 +00:00
smitha.x.smitha
0a20f2e5a2 No back icon in action bar of APN Settings
When entering the APN menu, the actionbar is missing a back
icon allowing the user to go back to the previous pane.

Added parentActivityName in ApnSettings, to enable action
bar back icon.

Change-Id: Iee8bb420f47c0e2c0d9a43739f534466abba30db
2013-05-20 09:55:09 +02:00
Kenny Root
3c10f53578 Merge "Track change to JSSE provider" 2013-04-30 04:01:45 +00:00
Kenny Root
d76bc2248e Track change to JSSE provider
Change-Id: I25d6612b12ab46b1f5c88c400b95bba1c023398a
2013-04-29 10:43:00 -07:00
Kenny Root
c814271fe4 Merge "Fix Clear Credentials item" 2013-04-27 21:39:31 +00:00
Kenny Root
8eb42bd2e0 Fix Clear Credentials item
This should be enabled whenever there is a credential in the keystore
since there can be unencrypted credentials in there now.

(cherry picked from commit c4372c3e3f)

Bug: 8651830
Change-Id: Ie06f20cf90f5a359975cb30d67052f8867b429b9
2013-04-27 09:05:43 -07:00
Amith Yamasani
c1e3983b31 Merge "Fix NullPointerException at RunningState" 2013-04-16 13:16:17 +00:00
Amith Yamasani
91b5fab9b0 Merge "Check if the Activity is finishing before showDialog()" 2013-04-16 13:13:53 +00:00
Kenny Root
3a27171881 Merge "Allow multiuser use of keystore" 2013-04-08 17:34:32 +00:00
Kenny Root
cc48b0104e Allow multiuser use of keystore
Since keystore has been refactored to let muliple users use it
simultaneously, we can remove all the restrictions put into place to
prevent it.

Bug: 7249554
Change-Id: I5aa069ca439cea68e87e141c497be8cd86b0ba9d
2013-04-08 10:23:38 -07:00
Kenny Root
43366b2c54 Merge "Add KeyStore storage type to Settings UI" 2013-03-29 21:09:47 +00:00
Kenny Root
39b56008be Add KeyStore storage type to Settings UI
Give the user an idea of what kind of credential storage is in use on
this device for keystore daemon.

Change-Id: Ic970fb908989662665bf1af968ca4a6a9dbfb55a
2013-03-29 11:48:55 -07:00
Kenny Root
9dc478ec23 Merge "Add ability to install credentials as other UID" 2013-03-28 20:57:04 +00:00
Kenny Root
7422474c72 Add ability to install credentials as other UID
We need the ability to install from the system UID to wifi UID
to explicitly bind WiFi credentials to the WiFi profile. This adds the
ability for Wifi Settings to invoke installation of a PKCS12 file for
the wifi UID.

Bug: 8183258
Change-Id: I357c4387baf7e2f6fd6acc9046d9e6b52fdd4bb0
2013-03-28 11:35:24 -07:00
Johan Redestig
910b2116b0 Fix NullPointerException at RunningState
getServiceInfo returns null if you have a service defined in the
manifest as: <service android:name=".Xxx" android:exported="false" />
or and in an <application> with no label or icon.
Dont crash the Settings application because of that.

Change-Id: I6f9f69c130e610b7e4ab66426177b7bade1e1515
2013-03-26 07:59:14 +01:00
Jeff Sharkey
74fd506bba Merge "Enable Ethernet tab in data usage" 2013-03-20 17:08:25 +00:00
Jaewan Kim
ffce9c1e9a Enable Ethernet tab in data usage
mStateSession is not initialized at the time hasEthernet is called to
set mShowEthernet, so Ethernet tab is not shown at the startup.
In this case, if the device doesn't support mobile network, user cannot
even select it from the context menu.

Bug: 8365419
Change-Id: I441971f18346c34a3adf3f18d9355075d9dce3f0
2013-03-20 11:22:30 +09:00
Robert Greenwalt
ae9ebfd153 Merge "add MVNO field for APN Editor" 2013-03-16 00:55:30 +00:00
Elliott Hughes
53309365f6 Merge "use date from 1970-01-01 to 2037-12-31 in DatePickerDialog" 2013-03-14 00:12:48 +00:00
Sungmin Choi
7ccfa0614c use date from 1970-01-01 to 2037-12-31 in DatePickerDialog
In case of using DatePickerDialog, user could select any date
before 1970-01-01. However, the system clock cannot be set to
a date before 1970-01-01.
As a result, user couldn't select date before 1970-01-01.
So, use date from 1970-01-01 to 2037-12-31 of DatePickerDialog.

Steps to reproduce:
1. Settings -> Date & time
2. uncheck Automatic date & time
3. Set Date
4. choose any date before 1970 and Done

Change-Id: I075b3fcaa86df1c314c85dd3dd85474a28b8c637
2013-03-13 17:11:28 -07:00
Amith Yamasani
506b68e1c5 Merge "Moved KEY_VIBRATE to NEED_VOICE_CAPABILITY" 2013-03-12 21:56:42 +00:00
Henrik Baard
2ac8da37d8 Moved KEY_VIBRATE to NEED_VOICE_CAPABILITY
There is an array (NEED_VOICE_CAPABILITY) with all keys that
should not be present in a device that does not have voice
capability.

The key KEY_VIBRATE was not part of this array, it was handled
separately in the code.

Moved KEY_VIBRATE to NEED_VOICE_CAPABILITY and remove the
special treatement.

Change-Id: I96aa066cec373ccbfe89c46b530feb484f6f8164
2013-03-11 13:40:46 +01:00
Amith Yamasani
6e0bff0d1b Merge "Fix the message when Bluetooth is turning off while on the tethering menu." 2013-03-08 18:24:22 +00:00
Ryan Baxter
232e6fb382 Fix the message when Bluetooth is turning off while on the tethering menu.
Currently says "Turning Wifi off..."
This change will display "Turning Bluetooth off..." instead.

Change-Id: I697d19ca4d7a69cc6b3729ad09fcf38bf5ab2427
Signed-off-by: Ryan Baxter <rbryanbaxter@gmail.com>
2013-03-07 20:36:22 -05:00
Irfan Sheriff
ba6a68c8c1 Merge "Fix not updating error message when authentication fails" 2013-03-05 19:08:15 +00:00
Jaewan Kim
0085de7999 Fix not updating error message when authentication fails
If attempt to configure the first network fails, AccessPoints fails to
update error message because it only checks the error code if it is not
active.

With this change, user may see saved network message for a second
because SupplicantStateTracker retries on authentication failure so
intermediate status is displayed between each trial.

Bug: 8284024
Change-Id: I8b976b03878e27e46726ee8a176f131115b7a409
2013-03-05 12:59:56 +09:00
Sungmin Choi
aa4d4c653b add MVNO field for APN Editor
For MVNO, add related data fields.

Bug: 8143480
Change-Id: Idfa06c6f39a2c15ff4f0815724823f44b76ac819
2013-02-28 13:20:39 +09:00
Wink Saville
a7d2fd80c2 Merge "avoid stopping app in case of accessing empty db" 2013-02-20 23:07:59 +00:00
Amith Yamasani
a5f756c9e6 Merge "Prevent cursor from causing global reference leaks." 2013-02-20 16:57:51 +00:00
Irfan Sheriff
ff5b96fb19 Merge changes If41fad5f,I9c860569,I2e3e8d4d,If65c4029
* changes:
  Use updated enterprise API
  Fix EAP field display for a new network
  Allow only valid EAP configs
  Update enterprise API usage
2013-02-15 23:42:50 +00:00
Irfan Sheriff
a51d1fb345 Use updated enterprise API
Change-Id: If41fad5fae5864555bb1de3fc99130682b1cdff1
2013-02-15 15:38:21 -08:00
Irfan Sheriff
0e22188088 Fix EAP field display for a new network
We now hide certain EAP fields based on the type chosen. For a
new network, we should set a default and handle this the same
way

Change-Id: I9c8605694ba51bc588a49f711dcf31517ea3f6e4
2013-02-15 15:38:00 -08:00
Irfan Sheriff
ce68912621 Allow only valid EAP configs
We allow configuring all possible EAP fields today even though
some of the configs make no sense and will not result in a
successful connection.

Allow only support configs for various EAP methods

Change-Id: I2e3e8d4d6203acb2eac8cd645df39e1a9ca579ab
2013-02-15 15:37:19 -08:00
Irfan Sheriff
f3a0201202 Update enterprise API usage
Also, remove the unnecessary keystore lock/unlock checks since these
are now controlled at lockscreen

Change-Id: If65c4029d4cf2b8377fbc3512c9f691572125995
2013-02-15 15:36:51 -08:00
Amith Yamasani
1ef6a106d5 Merge "Fix Settings app crash after enabled multi-user" 2013-02-15 17:15:41 +00:00
Hyejin Kim
88c80b10a2 avoid stopping app in case of accessing empty db
When accessing empty database, Setting App is stopped, sometimes.
To avoid stopping app, check null for cursor

Change-Id: I71ec067f502d12a9215a9abdbe9e23fc07af17bb
2013-02-16 01:02:30 +09:00
Kenny Root
bbe409d3ce Merge "KeyStore: stop using state()" 2013-02-14 20:18:11 +00:00
Kenny Root
ca714d8d0c KeyStore: stop using state()
Change-Id: Ia8fc945666c59c0b9a9bd6f890cc2a6b8859e1d4
2013-02-14 12:06:38 -08:00
Irfan Sheriff
5c879e48ed am 414d9e9c: Merge "P2PSetting:Avoid p2p_find on group removal event"
# By sunil duttu
# Via Gerrit Code Review (1) and sunil duttu (1)
* commit '414d9e9c6928581d4f91b008c109a6a4630bfaae':
  P2PSetting:Avoid p2p_find on group removal event
2013-02-06 11:16:24 -08:00
Irfan Sheriff
414d9e9c69 Merge "P2PSetting:Avoid p2p_find on group removal event" 2013-02-06 18:13:59 +00:00
sunil duttu
7c872478eb P2PSetting:Avoid p2p_find on group removal event
Immediately after group termination p2p_find is being issued
from settings and this causing issue whenever user sends
connection request immediately after group_removal_event.

Change-Id: I41e5f520f7d9475d0ec890d40eea172d9d66d06e
2013-02-06 23:18:30 +05:30
Irfan Sheriff
6639dee497 am 203631b2: Merge "wifiSettings: Updating the networkinfo on supplicant event"
# By sunil duttu
# Via Gerrit Code Review (1) and sunil duttu (1)
* commit '203631b24cd3947bcba2ab24789e4cfec487eff7':
  wifiSettings: Updating the networkinfo on supplicant event
2013-02-06 08:58:31 -08:00
Irfan Sheriff
203631b24c Merge "wifiSettings: Updating the networkinfo on supplicant event" 2013-02-06 16:42:45 +00:00
sunil duttu
f99d52cf71 wifiSettings: Updating the networkinfo on supplicant event
In framework we update the networkId on supplicant state change
these changes in the network info should be reflected in settings.
there by updating the networkinfo.
The problem we are facing without this fix is when we have single
saved AP profile Switching off the AP when we are in connecting
tate resulting in a behavior Where UI keep showing connecting
to that AP instead of showing it as out of range.

Change-Id: I04073b9a4068f4b75216ebfd431adc126583f15c
2013-02-06 12:04:37 +05:30
Jaewan Kim
bb0e621f18 Fix Settings app crash after enabled multi-user
Bug: 8128225
Change-Id: I2918a5ec36e861a1ce4b2e67cf7607929732a7bf
2013-02-04 15:36:17 +09:00
Per Allard
5416d07100 Prevent cursor from causing global reference leaks.
To fix this the ContentQueryMap needs to be closed
when onStop is called so any global references can
be reclaimed.

Change-Id: I0c679c10b0d75ab0aac2fe499563c57d934e318a
2013-02-01 08:09:04 +01:00
Tony Guo
63c91f0973 Check if the Activity is finishing before showDialog()
Check if the Activity is going through its finishing phase before
displaying the Dialog, because Showing dialog once the activity
is no longer in context will cause BadTokenException.

Change-Id: I58940e694f61cd79536abe2df60a0b745a7b806f
2013-01-29 14:39:26 +01:00