Migrate to using Mockito directly.
...
Change-Id: I1fcc5d1a780f5831bd6685f0735d4c0c6d245735
Jeff Sharkey
commited 2013-02-19 15:28:19 -08:00
760c62064b
merge in jb-mr2-release history after reset to master
The Android Automerger
commited 2013-02-19 09:51:20 -08:00
80d9e5b497
am dc7b3e3b: am 012e650e: Merge "KeyStore: stop using state()"
...
# Via Android Git Automerger (1) and others
* commit 'dc7b3e3b6e1aa3f347c7d843ee453688c4d90e29':
KeyStore: stop using state()
Kenny Root
authored and
Android Git Automerger
commited 2013-02-14 12:50:34 -08:00
7209c0bb2f
Merge "KeyStore: stop using state()"
Kenny Root
authored and
Gerrit Code Review
commited 2013-02-14 20:18:09 +00:00
012e650ed2
KeyStore: stop using state()
...
Change-Id: I721974fd95f8d1ab06a3fd1bbb4c9b4d9d1d7752
Kenny Root
commited 2013-02-14 12:06:51 -08:00
0ded63c2ff
Adjust captive portal test for setup wizard
...
During setup wizard, perform captive portal test without the typical
delays.
Change-Id: If596948e732966817aae6201440e87e19be0c2f8
Russell Brenner
commited 2013-02-14 11:02:10 -08:00
30fe264f5c
Fix a permissions probem in ConnectivityManager
...
stopUsingNetworkFeature fails because of new permissions checks in netd.
Change-Id: I04cb10d955c9dd9977c460c6c1db0d1910a863ce
Robert Greenwalt
commited 2013-02-12 17:18:25 -08:00
e767d81d8f
merge in jb-mr2-release history after reset to master
The Android Automerger
commited 2013-02-12 07:10:50 -08:00
06ad7f1b3d
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
Robert Greenwalt
authored and
The Android Automerger
commited 2013-02-11 16:22:37 -08:00
3874bd4930
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
Robert Greenwalt
commited 2013-02-11 15:25:10 -08:00
e41e3b3c09
Merge "Second pass tying into dns cache per interface"
Robert Greenwalt
authored and
Android (Google) Code Review
commited 2013-02-07 19:02:47 +00:00
01495af669
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
Mattias Falk
authored and
Robert Greenwalt
commited 2013-02-06 17:43:28 -08:00
d697aa2e38
Merge "Revert "Clean up published network condition reporting.""
Wink Saville
authored and
Android (Google) Code Review
commited 2013-01-31 00:32:36 +00:00
473710a912
Revert "Clean up published network condition reporting."
...
In some cases causes grey ICON's.
This reverts commit 2587a53c31
Wink Saville
authored and
Android (Google) Code Review
commited 2013-01-31 00:30:13 +00:00
151eaa6bc1
Merge "Revert "Second pass tying into dns cache per interface""
Robert Greenwalt
authored and
Android (Google) Code Review
commited 2013-01-19 00:36:12 +00:00
c9083111d9
Revert "Second pass tying into dns cache per interface"
...
This reverts commit b101d01167
Robert Greenwalt
authored and
Android (Google) Code Review
commited 2013-01-19 00:34:07 +00:00
d3aec30722
Clean up published network condition reporting.
...
Change-Id: I371c04bcb0547f1133e7ce12a6871aad3b3fdc6b
Wink Saville
commited 2013-01-18 09:31:13 -08:00
2587a53c31
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
Mattias Falk
authored and
Robert Greenwalt
commited 2013-01-11 15:47:08 -08:00
b101d01167
Merge "Up our DNS server support from 2 > 4"
Robert Greenwalt
authored and
Android (Google) Code Review
commited 2013-01-11 15:38:03 -08:00
b0134a39f5
Up our DNS server support from 2 > 4
...
bug:5958524
Change-Id: I81a9d9293049bcfc16c15ee856887aa7ed076638
Robert Greenwalt
commited 2013-01-11 09:47:46 -08:00
72e2243b31
Expose roaming flag for testing.
...
Change-Id: I29ef6fc59926a97f4e97c561387ac9bc0e4e4769
Jeff Sharkey
commited 2013-01-03 14:07:46 -08:00
f012738c73
am fe26d4e6: Merge from AOSP staging branch
...
* commit 'fe26d4e665
Jean-Baptiste Queru
authored and
Android Git Automerger
commited 2012-12-18 15:52:45 -08:00
9cbbececf4
Merge from AOSP staging branch
...
Change-Id: Iad3df4845e6fae16c4ae6dbddcad0121d4775dcd
Jean-Baptiste Queru
commited 2012-12-18 15:14:12 -08:00
fe26d4e665
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
Mikael Hedegren
authored and
Zoran Jovanovic
commited 2012-12-18 15:32:48 +01:00
c6534b5030
Fix javadoc break
...
Change-Id: Ia69a5cbead61747537269e267dcd8da320d61ba3
Robert Greenwalt
commited 2012-12-07 09:56:50 -08:00
f909cb1535
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>
Jianzheng Zhou
authored and
Robert Greenwalt
commited 2012-12-06 12:00:04 -08:00
028d203d0f
Merge "Support for dns domain."
Robert Greenwalt
authored and
Android (Google) Code Review
commited 2012-11-16 12:56:56 -08:00
402d9c853f
Support for dns domain.
...
bug:6799630
Change-Id: I10070eddb65b7b60f0bc2b3e1e320e1aa4ec6e98
Robert Greenwalt
commited 2012-11-16 11:25:32 -08:00
cd2778578b
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.
Jeff Sharkey
authored and
Android Git Automerger
commited 2012-11-12 10:36:46 -08:00
90c9ee4c74
Increase readability of connectivity event log.
...
Bug: 6322766
Change-Id: I556759f5fc1466cdd4db6b4574084a8068dc9909
Jeff Sharkey
commited 2012-11-09 15:57:02 -08:00
876ddc9564
Merge "Remove DhcpInfoInternal"
Robert Greenwalt
authored and
Android (Google) Code Review
commited 2012-11-09 09:51:21 -08:00
75261775dd
Remove DhcpInfoInternal
...
First step in accepting a set of patches.
bug:6799630
Change-Id: I6c894c60aeb3022960c2aaa45451bb1dde2b493b
Robert Greenwalt
commited 2012-11-09 09:46:32 -08:00
462e5705c8
am e0d454d2: am 72325cdb: am 63bc6c12: am a46a74fc: Merge "Remove extraneous logs." into jb-mr1-dev
...
* commit 'e0d454d2e86f4170bdab68d45696fb2eb9a87f9f':
Remove extraneous logs.
Dianne Hackborn
authored and
Android Git Automerger
commited 2012-11-08 15:58:52 -08:00
adfa5eb59f
Remove extraneous logs.
...
Change-Id: I4c47d36748de91bd6fddc419afbf59552bf63e9a
Dianne Hackborn
commited 2012-11-08 13:13:48 -08:00
dc456a66da
am 65f4de10: am 3a8af8ef: Merge "Migrate more Secure settings to Global." into jb-mr1-dev
...
* commit '65f4de101fa8d5752603c6e79536c3a17f585490':
Migrate more Secure settings to Global.
Jeff Sharkey
authored and
Android Git Automerger
commited 2012-09-28 00:36:41 -07:00
594ea872c8
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
Jeff Sharkey
commited 2012-09-27 16:22:53 -07:00
8c87045d09
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.
Jeff Sharkey
authored and
Android Git Automerger
commited 2012-09-26 20:23:07 -07:00
e7e592df15
First step towards cleaning up Global settings.
...
Remove all @Deprecated @hide settings, and clean up any stragglers.
Bug: 7232125
Change-Id: Ibf67093c728d4a28565129b923edb1701d3b2789
Jeff Sharkey
commited 2012-09-26 17:18:49 -07:00
8b36157b58
am b39f3f46: am f605dcb8: 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
Ashish Sharma
authored and
Android Git Automerger
commited 2012-09-26 13:53:01 -07:00
5389aec62e
Merge "Migrate DATA_ACTIVITY_TIMEOUT_MOBILE/WIFI from Settings.Secure to Settings.Global" into jb-mr1-dev
Ashish Sharma
authored and
Android (Google) Code Review
commited 2012-09-26 13:49:29 -07:00
f605dcb8ad
Migrate DATA_ACTIVITY_TIMEOUT_MOBILE/WIFI from Settings.Secure to Settings.Global
...
Bug: 7189605
Change-Id: Id54b8d490d7849bf071c3fbfd8f7358ed873a4e8
Ashish Sharma
commited 2012-09-26 13:45:18 -07:00
6c97dcf3c7
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.
Jeff Brown
authored and
Android Git Automerger
commited 2012-09-25 17:11:25 -07:00
0482f99ae4
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
Jeff Brown
commited 2012-09-25 15:27:51 -07:00
c67cf56735
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
Irfan Sheriff
authored and
Android Git Automerger
commited 2012-09-20 13:39:30 -07:00
675a99bdb0
Captive check for both mobile and wifi
...
Bug: 7113195
Bug: 7102238
Bug: 7087564
Change-Id: Iac08db9de3935338ad498aa3983d2ca82057dda1
Irfan Sheriff
commited 2012-09-20 12:13:06 -07:00
32bed2cc47
am 116e0ed0: am c3e3311c: Merge "Migrate network stats from removed users." into jb-mr1-dev
...
* commit '116e0ed0ed1fee530f32932be7145d64316dce9b':
Migrate network stats from removed users.
Jeff Sharkey
authored and
Android Git Automerger
commited 2012-09-20 06:17:38 -07:00
9064fe5e00
Migrate network stats from removed users.
...
When a user is removed, migrate all network stats belonging to that
user into special UID_REMOVED bucket. Also removes those stats from
kernel to avoid double-counting if another user is created.
Bug: 7194784
Change-Id: I03f1d660fe3754566326b7749cae8068fc224ea9
Jeff Sharkey
commited 2012-09-19 14:54:05 -07:00
d53c789d44
am 1e364aca: am 04a34b37: Merge "Actually move to Global settings." into jb-mr1-dev
...
* commit '1e364acac6f4768672deb73485e93c32929e25fd':
Actually move to Global settings.
Jeff Sharkey
authored and
Android Git Automerger
commited 2012-09-17 11:10:16 -07:00
2ae72b424f
Actually move to Global settings.
...
Also add better ConnectivityService logging.
Bug: 7157464
Change-Id: Ia235a7e62ed809240913c4782920c1410c7d597d
Jeff Sharkey
commited 2012-09-14 13:47:51 -07:00
cf6ffaff69
am 52781414: am fa8d83d9: Merge "Restrict lockdown and firewall to AID_SYSTEM." into jb-mr1-dev
...
* commit '527814142037fe08934b4e9ef3961742ffbd5a20':
Restrict lockdown and firewall to AID_SYSTEM.
Jeff Sharkey
authored and
Android Git Automerger
commited 2012-09-06 18:07:27 -07:00
61db689ddb
Jeff Sharkey
commited 
The Android Automerger
commited 
Kenny Root
authored and
Android Git Automerger
commited 
Gerrit Code Review
commited 
Russell Brenner
commited 
Robert Greenwalt
commited 
Android (Google) Code Review
commited 
Mattias Falk
authored and
Wink Saville
authored and
Jean-Baptiste Queru
authored and
Mikael Hedegren
authored and
Zoran Jovanovic
commited 
Jianzheng Zhou
authored and
Dianne Hackborn
authored and
Ashish Sharma
authored and
Jeff Brown
authored and
Irfan Sheriff
authored and