Jeff Sharkey
b103b2578b
Allow loopback traffic in lockdown mode.
...
Bug: 8245184
Change-Id: If993e3d6f5c7ce5970bfe701074c85b9245aa2aa
2013-02-28 16:57:58 -08:00
Robert Greenwalt
dc55f48d64
Remove two new permission checks
...
These checks while technically reasonable are a hard to swallow API change
that may break existing apps and pragmatically serves no purpose: the protected
data is available in publicly readable java VM properties.
Change-Id: I522c493c2604a33e28d99e2be31054326c9a8323
2013-02-22 15:36:33 -08:00
Robert Greenwalt
26744a5f52
Improve ConnectivityManager docs
...
Also fix some permission problems.
bug:5738328
Change-Id: Ib32c223f425b1fc03b8cce528456bcb50b540fdf
2013-02-22 10:39:20 -08:00
Jeff Sharkey
6932ff654e
Improve notification UI for lockdown VPN.
...
Bug: 7064111
Change-Id: I9554f6a426697b4abeb2ddd0827d314920e88ed6
2013-02-21 09:47:11 -08:00
The Android Automerger
be253713d5
merge in jb-mr2-release history after reset to master
2013-02-20 05:55:44 -08:00
Jeff Sharkey
c8a2687705
Migrate to using Mockito directly.
...
Change-Id: I1fcc5d1a780f5831bd6685f0735d4c0c6d245735
2013-02-19 15:28:19 -08:00
The Android Automerger
97b1a03c38
merge in jb-mr2-release history after reset to master
2013-02-19 09:51:20 -08:00
Kenny Root
9a51314973
am dc7b3e3b: am 79a80652: Merge "KeyStore: stop using state()"
...
# Via Android Git Automerger (1) and others
* commit 'dc7b3e3b6e1aa3f347c7d843ee453688c4d90e29':
KeyStore: stop using state()
2013-02-14 12:50:34 -08:00
Kenny Root
79a806525a
Merge "KeyStore: stop using state()"
2013-02-14 20:18:09 +00:00
Kenny Root
e3a37b21ca
KeyStore: stop using state()
...
Change-Id: I721974fd95f8d1ab06a3fd1bbb4c9b4d9d1d7752
2013-02-14 12:06:51 -08:00
Russell Brenner
4774b0208e
Adjust captive portal test for setup wizard
...
During setup wizard, perform captive portal test without the typical
delays.
Change-Id: If596948e732966817aae6201440e87e19be0c2f8
2013-02-14 11:02:10 -08:00
Robert Greenwalt
1790009c36
Fix a permissions probem in ConnectivityManager
...
stopUsingNetworkFeature fails because of new permissions checks in netd.
Change-Id: I04cb10d955c9dd9977c460c6c1db0d1910a863ce
2013-02-12 17:18:25 -08:00
The Android Automerger
a78d5678c8
merge in jb-mr2-release history after reset to master
2013-02-12 07:10:50 -08:00
Robert Greenwalt
306cd386ff
Reintroduce the net.dns system properties <TEMP>
...
Removing these properties broke video playback as they used
a custom dns resolver. We'll work together to resolve our
resolver issues in the future, but this was the easy fix to
get things working again.
bug:8173236
Change-Id: I687dae59eda4fc449efc34eed11c3dc88a110ad0
2013-02-11 16:22:37 -08:00
Robert Greenwalt
d44340d0ec
Reintroduce the net.dns system properties <TEMP>
...
Removing these properties broke video playback as they used
a custom dns resolver. We'll work together to resolve our
resolver issues in the future, but this was the easy fix to
get things working again.
bug:8173236
Change-Id: I687dae59eda4fc449efc34eed11c3dc88a110ad0
2013-02-11 15:25:10 -08:00
Robert Greenwalt
75c17e5f38
Merge "Second pass tying into dns cache per interface"
2013-02-07 19:02:47 +00:00
Mattias Falk
dc919017de
Second pass tying into dns cache per interface
...
Set dns servers for secondary nets and attach the
processes (pids) that are using the secondary nets
to the secondary nets associated dns cache.
bug:5465296
Change-Id: I1eaf92d5c6b81d287e9fb2763b3d972d9de34395
2013-02-06 17:43:28 -08:00
Wink Saville
75ba50a4fa
Merge "Revert "Clean up published network condition reporting.""
2013-01-31 00:32:36 +00:00
Wink Saville
3e8667288e
Revert "Clean up published network condition reporting."
...
In some cases causes grey ICON's.
This reverts commit 463928fabe
Change-Id: I09f893d03651c3fb9fcb88ee9e5ac7ce6cb6e273
2013-01-31 00:30:13 +00:00
Robert Greenwalt
3ed6099b4b
Merge "Revert "Second pass tying into dns cache per interface""
2013-01-19 00:36:12 +00:00
Robert Greenwalt
b16bf0de50
Revert "Second pass tying into dns cache per interface"
...
This reverts commit ea8d68962c
Change-Id: If52dffd5100a6b03275da0eabfa05e24c5ecada9
2013-01-19 00:34:07 +00:00
Wink Saville
463928fabe
Clean up published network condition reporting.
...
Change-Id: I371c04bcb0547f1133e7ce12a6871aad3b3fdc6b
2013-01-18 09:31:13 -08:00
Mattias Falk
ea8d68962c
Second pass tying into dns cache per interface
...
Set dns servers for secondary nets and attach the
processes (pids) that are using the secondary nets
to the secondary nets associated dns cache.
Change-Id: Id865c2c3fdc0ec1c3e30c134e9ea4109f4f2fbeb
bug:5465296
2013-01-11 15:47:08 -08:00
Robert Greenwalt
f345cde69e
Merge "Up our DNS server support from 2 > 4"
2013-01-11 15:38:03 -08:00
Robert Greenwalt
433c98a848
Up our DNS server support from 2 > 4
...
bug:5958524
Change-Id: I81a9d9293049bcfc16c15ee856887aa7ed076638
2013-01-11 09:47:46 -08:00
Jeff Sharkey
e35bff840d
Expose roaming flag for testing.
...
Change-Id: I29ef6fc59926a97f4e97c561387ac9bc0e4e4769
2013-01-03 14:07:46 -08:00
Jean-Baptiste Queru
7542010f7b
am 3f051210: Merge from AOSP staging branch
...
* commit '3f051210cdee7f9e66abe947e898e1673586c858':
Return error upon attempt to use non-existent APN
Memory leak due to bad destroy sequence
2012-12-18 15:52:45 -08:00
Jean-Baptiste Queru
3f051210cd
Merge from AOSP staging branch
...
Change-Id: Iad3df4845e6fae16c4ae6dbddcad0121d4775dcd
2012-12-18 15:14:12 -08:00
Mikael Hedegren
b5125b0f8f
Return error upon attempt to use non-existent APN
...
startUsingNetworkFeature will ignore errors from
reconnect - causing ConnectivityService to send
faulty information back to requester.
Change-Id: I4e0fcc1addd84da409cdc1eed1a95d25d925e020
2012-12-18 15:32:48 +01:00
Robert Greenwalt
1ee3d2c33e
Fix javadoc break
...
Change-Id: Ia69a5cbead61747537269e267dcd8da320d61ba3
2012-12-07 09:56:50 -08:00
Jianzheng Zhou
a8aa160836
Refactor getPersistedNetworkPreference
...
Optimize for updating mNetworkPreference according to device's networkAttributes
setting from overlay config.xml when connectivityservice start.
Change-Id: I90286332d4f453038f1ddac7dd9d1265d96b4859
Signed-off-by: Jianzheng Zhou <jianzheng.zhou@freescale.com >
2012-12-06 12:00:04 -08:00
Robert Greenwalt
ff31bee14a
Merge "Support for dns domain."
2012-11-16 12:56:56 -08:00
Robert Greenwalt
0bc6c967cc
Support for dns domain.
...
bug:6799630
Change-Id: I10070eddb65b7b60f0bc2b3e1e320e1aa4ec6e98
2012-11-16 11:25:32 -08:00
Jeff Sharkey
7a4d27dfdf
am 298d5f42: am b84f21c5: am bc0edecb: Merge "Increase readability of connectivity event log." into jb-mr1.1-dev
...
* commit '298d5f422e6af0d12499173c403d4ff8dda3aeda':
Increase readability of connectivity event log.
2012-11-12 10:36:46 -08:00
Jeff Sharkey
bde3269295
Increase readability of connectivity event log.
...
Bug: 6322766
Change-Id: I556759f5fc1466cdd4db6b4574084a8068dc9909
2012-11-09 15:57:02 -08:00
Robert Greenwalt
2be645a342
Merge "Remove DhcpInfoInternal"
2012-11-09 09:51:21 -08:00
Robert Greenwalt
e110d00751
Remove DhcpInfoInternal
...
First step in accepting a set of patches.
bug:6799630
Change-Id: I6c894c60aeb3022960c2aaa45451bb1dde2b493b
2012-11-09 09:46:32 -08:00
Dianne Hackborn
044ac6a1c8
am e0d454d2: am 72325cdb: am 63bc6c12: am a46a74fc: Merge "Remove extraneous logs." into jb-mr1-dev
...
* commit 'e0d454d2e86f4170bdab68d45696fb2eb9a87f9f':
Remove extraneous logs.
2012-11-08 15:58:52 -08:00
Dianne Hackborn
dd62fef2a3
Remove extraneous logs.
...
Change-Id: I4c47d36748de91bd6fddc419afbf59552bf63e9a
2012-11-08 13:13:48 -08:00
Jeff Sharkey
b1ed51bc0e
am 65f4de10: am 3a8af8ef: Merge "Migrate more Secure settings to Global." into jb-mr1-dev
...
* commit '65f4de101fa8d5752603c6e79536c3a17f585490':
Migrate more Secure settings to Global.
2012-09-28 00:36:41 -07:00
Jeff Sharkey
5eccd9c147
Migrate more Secure settings to Global.
...
Migrate networking, storage, battery, DropBox, and PackageManager
related Secure settings to Global table.
Bug: 7232014, 7231331, 7231198
Change-Id: I772c2a9586a2f708c9db95622477f235064b8f4d
2012-09-27 16:22:53 -07:00
Jeff Sharkey
621975ad96
am f57fcddb: am 68b7a6d1: Merge "First step towards cleaning up Global settings." into jb-mr1-dev
...
* commit 'f57fcddb61236c6e9c145d8f310bf1f4b1daafbb':
First step towards cleaning up Global settings.
2012-09-26 20:23:07 -07:00
Jeff Sharkey
9ee49b3917
First step towards cleaning up Global settings.
...
Remove all @Deprecated @hide settings, and clean up any stragglers.
Bug: 7232125
Change-Id: Ibf67093c728d4a28565129b923edb1701d3b2789
2012-09-26 17:18:49 -07:00
Ashish Sharma
3136c613e1
am b39f3f46: am 1c1c06fa: Merge "Migrate DATA_ACTIVITY_TIMEOUT_MOBILE/WIFI from Settings.Secure to Settings.Global" into jb-mr1-dev
...
* commit 'b39f3f4696bf473d986ecc45461754beec931174':
Migrate DATA_ACTIVITY_TIMEOUT_MOBILE/WIFI from Settings.Secure to Settings.Global
2012-09-26 13:53:01 -07:00
Ashish Sharma
1c1c06faeb
Merge "Migrate DATA_ACTIVITY_TIMEOUT_MOBILE/WIFI from Settings.Secure to Settings.Global" into jb-mr1-dev
2012-09-26 13:49:29 -07:00
Ashish Sharma
a0854aea07
Migrate DATA_ACTIVITY_TIMEOUT_MOBILE/WIFI from Settings.Secure to Settings.Global
...
Bug: 7189605
Change-Id: Id54b8d490d7849bf071c3fbfd8f7358ed873a4e8
2012-09-26 13:45:18 -07:00
Jeff Brown
42af268864
am 876f95ed: am b32e2216: Merge changes I332f020f,I632648ac into jb-mr1-dev
...
* commit '876f95ed7f914b4d86634db552277f835d288805':
Update references to migrated global settings.
Handle user switched for settings changes.
2012-09-25 17:11:25 -07:00
Jeff Brown
8727271fdd
Update references to migrated global settings.
...
Fixed one setting that was migrated but not marked deprecated.
Removed a hidden setting that is no longer used by the new
power manager service.
Bug: 7231172
Change-Id: I332f020f876a18d519a1a20598a172f1c98036f7
2012-09-25 15:27:51 -07:00
Irfan Sheriff
b974e23410
am 6c0fcc96: am 314488b7: Merge "Captive check for both mobile and wifi" into jb-mr1-dev
...
* commit '6c0fcc961e1650113947918dc105c2a459ebf40d':
Captive check for both mobile and wifi
2012-09-20 13:39:30 -07:00
Irfan Sheriff
2e617a7405
Captive check for both mobile and wifi
...
Bug: 7113195
Bug: 7102238
Bug: 7087564
Change-Id: Iac08db9de3935338ad498aa3983d2ca82057dda1
2012-09-20 12:13:06 -07:00