Commit Graph

2986 Commits

Author SHA1 Message Date
Jeff Sharkey
5d108e4eb1 Merge "Cluster apps by user in Data Usage." 2012-03-22 11:13:57 -07:00
Jeff Sharkey
ef6e1ff728 Cluster apps by user in Data Usage.
When displaying apps that have used data, cluster all app usage
together regardless of profile/user.  Always persist policy rules
using primary UID (the UID under the default user).

Bug: 6140462
Change-Id: Ia00bb42b26987553926f4027583dbe03b3bafba1
2012-03-22 11:10:45 -07:00
Danielle Millett
1fac8887e4 Merge "Added a liveliness check box preference for Face Unlock." 2012-03-22 07:48:32 -07:00
Mike Lockwood
cd2fc47389 Merge commit '50339f3'
turn off log spew

Change-Id: I1bd25f3954497557762fda0ebea64bc21031eef7
2012-03-21 16:12:27 -07:00
Kenny Root
455a911df3 Switch VPN to use keystore ENGINE
The VPN client will no longer receive the private key material directly
from the caller. Instead it will use the keystore OpenSSL ENGINE to
request that keystore does private key operations on its behalf.

We only pass the keystore key alias to the private key instead of the
private key itself now.

Change-Id: I4ea2abda5ab7dec7d7ef5f451b96fef5bc92d811
2012-03-21 15:00:47 -07:00
Kenny Root
b50b15cdbe Convert to new KeyStore format
keystore no longer stores private key material in the clear. It needs to
use an opaque handle for the private key material and then keystore will
sign the data on the requester's behalf instead of returning the key
material.

Change-Id: I836749769a8519cfc21bfdc2a3b3c8c1a01d8f05
2012-03-21 14:57:29 -07:00
Kenny Root
4786b261d3 Update Wifi to use new keystore function
The old wpa_supplicant.conf format used a special URI prefix
"keystore://" for the private_key value to indicate when to load things
from keystore.

The new format uses an OpenSSL ENGINE to perform operations with the
private key, so we don't need the special URI prefix.

Change-Id: I04751846f72b22eb5fc947bd7a32f47713e9fc82
2012-03-21 14:52:16 -07:00
Danielle Millett
a87a25bdec Added a liveliness check box preference for Face Unlock.
This will be used to enable or disable liveliness detection.

Change-Id: I0be735724aed4cadbd5c37d895a7f80ad4f4ee09
2012-03-21 13:32:56 -04:00
Jeff Sharkey
9944314c2b Merge "Remember when NetworkPolicy was inferred." 2012-03-20 16:54:54 -07:00
Jeff Sharkey
012c16b62c Remember when NetworkPolicy was inferred.
Change-Id: If2e8ba37fa166e1711650b87392af2ac3a418269
2012-03-20 16:52:43 -07:00
Irfan Sheriff
5fe6069399 Merge "Add static ip/proxy support for hidden networks" 2012-03-20 14:42:03 -07:00
Jeff Sharkey
11d3012c78 Enforcement control for READ_EXTERNAL permission.
Surface enforcement controls for READ_EXTERNAL_STORAGE permission
using new PackageManager API.

Bug: 6131916
Change-Id: I0ece4742666fda58e41410cb4b0b7175f280fa31
2012-03-19 17:23:01 -07:00
Irfan Sheriff
d61f7cd3aa Add static ip/proxy support for hidden networks
Add support for static ip and proxy. In the process, clean up the issues
that showed up during testing.

Bug: 5459872
Change-Id: I96c8fff816b6cbb485d2bb215349193e49f3d0b2
2012-03-19 16:05:49 -07:00
Jeff Sharkey
a8106f248c Auto grid lines, lower minimum, disable estimates.
Show automatic grid lines with power-of-two spacing, avoiding ANR
when trying to render thousands of gridlines.  Lower minimum chart
height to 50MB to give better view of linear data.  Also disable
estimates rendering.

Bug: 5500204, 6005240
Change-Id: Iacfed11b32c0095c9c2d08bee6a1b5e29637de98
2012-03-15 18:38:36 -07:00
Jeff Sharkey
3235ddb7aa Avoid Data Usage AppDetailsFragment ISE.
Bug: 6022913
Change-Id: I4672b327096add4beeeb52f0bb467622b3467fcf
2012-03-15 16:40:31 -07:00
Jake Hamby
a9534367b5 Fix IME soft keyboard for Bluetooth rename device dialog.
The soft keyboard should automatically pop up when the user selects
the Bluetooth rename device menu item. Fixed by calling
setSoftInputMode(SOFT_INPUT_STATE_ALWAYS_VISIBLE) on the Window
containing the AlertDialog before showing.

The device name field should also be a single line field, with the
Done button causing the device to be renamed. Set the "singleLine"
attribute in the layout XML to true, and added a
TextView.OnEditorActionListener to set the device name and dismiss
the dialog for EditorInfo.IME_ACTION_DONE.

Bug: 5342542
Bug: 5343354
Change-Id: I550d8e9a59395ad66f8a9c11d29c0f2ef278c196
2012-03-13 20:08:22 -07:00
Irfan Sheriff
42f0f19b47 Merge "Enhance static IP UI" 2012-03-13 14:28:39 -07:00
Irfan Sheriff
db529dd66b Enhance static IP UI
Based on the IP address provided, choose a default gateway, network prefix
and DNS to reduce typing for common scenarios

Bug: 6006249
Change-Id: I27878ce7895386b744013f267d29b3309208ec07
2012-03-13 11:16:14 -07:00
Jeff Sharkey
3f3a7f5400 Merge "Save timezone when setting data cycle reset date." 2012-03-09 18:33:51 -08:00
Jeff Sharkey
e5223a0577 Save timezone when setting data cycle reset date.
Bug: 5938567
Change-Id: I9df8da9d030169952098efc04cfde79e3e42e1f8
2012-03-09 18:24:01 -08:00
Irfan Sheriff
a318d1e821 Fix p2p settings NPE
Bug: 6138959
Change-Id: I0c930686220ad8a77e3a998a108158b2467b5707
2012-03-09 15:18:42 -08:00
Amith Yamasani
d220c8a6fe Fix NPE due to removed preference.
Bug: 6138309
Change-Id: I2161cb3bf58f1a1a67a136b4c7646cd7b53f6f8a
2012-03-08 11:15:49 -08:00
Irfan Sheriff
bb0c3c60dc Merge "P2p UI fixes" 2012-03-07 11:22:06 -08:00
Irfan Sheriff
6ac5554d30 P2p UI fixes
- Move Wi-Fi direct as a setting in Wi-Fi
- Handle some UI refresh issues

Change-Id: Idc43a2ca98acc4b904ca1f5fe0b1447ee612f218
2012-03-07 10:54:06 -08:00
Dianne Hackborn
7d09187e41 Use a component name that actually exists when enabling/disabling.
Change-Id: Id6422a0039060bce3dc1bdc39551f04a4e4adbe6
2012-03-05 18:37:54 -08:00
Irfan Sheriff
90380120e7 Enhance and fix WPS UI
- Fixes WPS usage for open network
- Exposes WPS on UI for easy access to push button and pin based techniques
- Adds support for cancelling WPS
- Adds a dialog that reports a progress since WPS can take quite a bit of time
to complete

The WpsDialog code is enhanced from contribution by yoshihiko.ikenaga@jp.sony.com
on partner source.

Change-Id: Ib0103507e0192e8195e7bfeb1c8e8855c20e23ca
2012-03-02 14:25:00 -08:00
Irfan Sheriff
6c9c305b28 am f91e52c9: am c4bf8cd9: am 2f76aaaf: Merge "Enable EAP-pwd configuration in WiFi Settings."
* commit 'f91e52c986f4e7f8094a794c471813ac05d5d59c':
  Enable EAP-pwd configuration in WiFi Settings.
2012-03-01 23:57:12 -08:00
Irfan Sheriff
c4bf8cd955 am 2f76aaaf: Merge "Enable EAP-pwd configuration in WiFi Settings."
* commit '2f76aaaf0105add942334ef3574e7378ee8a6097':
  Enable EAP-pwd configuration in WiFi Settings.
2012-03-01 22:48:42 -08:00
Irfan Sheriff
2f76aaaf01 Merge "Enable EAP-pwd configuration in WiFi Settings." 2012-03-01 16:47:19 -08:00
Irfan Sheriff
8f2f08e0ee Use new WifiManager API
Change-Id: I9cc092e98412146a07c1829cacab47b8cea0bc9a
2012-03-01 13:53:37 -08:00
Irfan Sheriff
e2fd7e0dcd Merge "Add support for wifi verification before connect" 2012-02-29 19:35:17 -08:00
Irfan Sheriff
09a9b38fbc Add support for wifi verification before connect
Change-Id: Ie1fb9c2fad4f75985077236eab61c296314f4fe4
2012-02-29 19:32:40 -08:00
Chia-chi Yeh
94cc1bbf32 VpnSettings: show more error messages when VPN fails.
Bug: 6032883
Change-Id: Idc49e1b611fd0c01f199bfde984084a8e4c62e17
2012-02-29 16:12:35 -08:00
Amith Yamasani
e5cb62f5f4 am 93724840: Don\'t crash if there\'s no bluetooth functionality (such as in an emulator) do not merge.
* commit '9372484065993cfdb9a48ddecc52d2ed911e8ce1':
  Don't crash if there's no bluetooth functionality (such as in an emulator) do not merge.
2012-02-28 10:13:28 -08:00
Amith Yamasani
9372484065 Don't crash if there's no bluetooth functionality (such as in an emulator) do not merge.
Bug: 6079494

(cherry picked from commit 5fb53f36cb)

Change-Id: Ia0d3a638f93c7c7923ce6e85f3555af0aeda96f9
2012-02-28 09:58:45 -08:00
Amith Yamasani
ae3b75f0fb Merge "Don't crash if there's no bluetooth functionality (such as in an emulator)" 2012-02-28 09:34:05 -08:00
Joe Onorato
50339f3da1 turn off log spew
Change-Id: I10f70d5f173cb04e9f58434d9daf0bb01498b813
2012-02-27 22:32:43 -08:00
Amith Yamasani
5fb53f36cb Don't crash if there's no bluetooth functionality (such as in an emulator)
Bug: 6079494
Change-Id: I12f729134407eaa719dc6a25e89a3b48476985e2
2012-02-27 17:18:45 -08:00
Partha N
ba7ee527d8 Enable EAP-pwd configuration in WiFi Settings.
EAP-pwd (RFC 5931) is an EAP method that uses a shared password
for authentication. It has the simplicity of setup as WPA2-PSK
(no certificates), but provides strong authenticaiton like 802.1x.

Modified the Settings screen so that the only visible fields
when choosing EAP-pwd are 'identity' and 'password'.

Change-Id: I9365d873b43c416ddfa4cae47b7419d902c212a7
Signed-off-by: Partha N <parthan@gmail.com>
2012-02-26 22:26:55 -08:00
Robert Greenwalt
aaef0f6b2b Merge "Use the framework rather than RIL constants" 2012-02-24 15:00:21 -08:00
Daisuke Miyakawa
b9bac4a98e Remove "Vibrate and ring" option
It will be part of Phone's settings. See Ifb19b53b850ee8a4c15

Bug: 6029673
Change-Id: I7168ed140266a7c754fb3d7209cf12e73041c306
2012-02-22 14:30:06 -08:00
Irfan Sheriff
15c0da1314 Merge "Fix cursor position for password" 2012-02-17 16:05:44 -08:00
Irfan Sheriff
bd3d66cac5 Fix cursor position for password
Bug: 5757292
Change-Id: Iad34b09ee56c24694ebf45350f0dbc398f2cfa06
2012-02-17 16:04:05 -08:00
Robert Greenwalt
e37f427cbb Use the framework rather than RIL constants
bug:5717664
Change-Id: I07f8fe3a874aff775e4be8513cd020bf9d090b6a
2012-02-17 15:25:14 -08:00
Irfan Sheriff
8f046d6d6a Merge "Concurrency wifi p2p and client operation support" 2012-02-14 15:39:09 -08:00
Dianne Hackborn
c1cca607cf Merge "Add debug app / wait for debugger dev options." 2012-02-14 14:07:03 -08:00
Dianne Hackborn
9244df4c64 Add debug app / wait for debugger dev options.
Re-organize dev options a bit.

Change-Id: I291b177c87cb8fb4bd8316d05aa6eadfaaf5f0d2
2012-02-14 13:46:27 -08:00
Irfan Sheriff
81da488477 Fix NPE
Bug: 5953080
Change-Id: I1ff5b8a878f8f0d2fd9c6da549804aa454db444c
2012-02-13 22:28:13 -08:00
Mike J. Chen
31c5ec8202 Allows auto dismissing of bluetooth activation dialogs
Create a new overlay boolean that allows products (like Android@Home
ones that have no or minimal display) to not bring up the bluetooth
activation confirmation dialog.

Change-Id: Ib76a26d440ede34cc8a41ffc8b680ca2b20b38ca
Signed-off-by: Mike J. Chen <mjchen@google.com>
2012-02-10 15:29:44 -08:00
Dianne Hackborn
e44f44d679 New dev setting to turn off HW overlays.
Change-Id: I747ac6d90dfb8a7a0bbf547ce7cae8ee86f8d5d0
2012-02-07 11:40:30 -08:00