The Android Open Source Project
6fc25cfd15
am 9bd03ece: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge
...
* commit '9bd03ece3c5a5da0f101c7551666bd6752202611':
2013-07-15 09:37:54 -07:00
The Android Open Source Project
9bd03ece3c
Reconcile with jb-mr2-zeroday-release - do not merge
...
Change-Id: Ib08f5c3c72f9d6eee571e7f9dff130abadffbbec
2013-07-15 09:32:49 -07:00
The Android Automerger
3ad46b8636
merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev
2013-07-15 08:19:11 -07:00
Wink Saville
c137d87017
am 7d8ad734: am 42a85412: am 925ec03f: Merge "VZW wants the phoneNumber to be 10 zero\'s if there isn\'t one." into jb-mr2-dev
...
* commit '7d8ad734af2dee4e7d6f9c5eee8487e020b374ea':
VZW wants the phoneNumber to be 10 zero's if there isn't one.
2013-07-12 12:14:01 -07:00
Wink Saville
7d8ad734af
am 42a85412: am 925ec03f: Merge "VZW wants the phoneNumber to be 10 zero\'s if there isn\'t one." into jb-mr2-dev
...
* commit '42a85412d12078f36c3fdeda1211bdc3800bab0c':
VZW wants the phoneNumber to be 10 zero's if there isn't one.
2013-07-12 12:03:53 -07:00
Wink Saville
dfabd993a7
VZW wants the phoneNumber to be 10 zero's if there isn't one.
...
Bug: 9784059
Change-Id: I41bba908855648d2560440655d8a75a7cb2e0859
2013-07-10 23:00:07 -07:00
The Android Open Source Project
5c0dd380d0
am 29dd8449: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge
...
* commit '29dd8449e6d3ee34e229e8efdb1024c20e2cddd2':
2013-07-08 15:52:24 -07:00
The Android Open Source Project
29dd8449e6
Reconcile with jb-mr2-zeroday-release - do not merge
...
Change-Id: Id0d9eb3205906b409e735546b988f43a3bdcc0ae
2013-07-08 15:33:43 -07:00
The Android Automerger
ccf8df7dec
merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev
2013-07-08 05:55:31 -07:00
The Android Open Source Project
013df9a0a7
am d25b6b73: (-s ours) Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge
...
* commit 'd25b6b7372984cc0986868af9c53a4979436b6a8':
Expose latency methods through AudioManager and AudioTrack.
Fix NPE if mobile is not supported in checkMobileProvisioning.
Temporarily disable 'Scan Always' mode
2013-07-03 08:53:48 -07:00
The Android Open Source Project
d25b6b7372
Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge
...
Change-Id: I343bd8f6d948c90cd5cede9dc160c86ebce6501c
2013-07-03 08:51:11 -07:00
Wink Saville
b72702da1f
am ef5c31ae: am db011499: am 753d754c: Merge "Fix NPE if mobile is not supported in checkMobileProvisioning." into jb-mr2-dev
...
* commit 'ef5c31ae3eced8b5def6881c86d962fa07d43fb0':
Fix NPE if mobile is not supported in checkMobileProvisioning.
2013-07-02 12:41:31 -07:00
Wink Saville
ef5c31ae3e
am db011499: am 753d754c: Merge "Fix NPE if mobile is not supported in checkMobileProvisioning." into jb-mr2-dev
...
* commit 'db011499c80f663b30564f1978f3e8e56d60f6c6':
Fix NPE if mobile is not supported in checkMobileProvisioning.
2013-07-02 12:36:47 -07:00
Wink Saville
ec5eb01134
Fix NPE if mobile is not supported in checkMobileProvisioning.
...
Bug: 9664438
Change-Id: If0c4938956a80e8d6a21a968aa771d0d8f546b3c
2013-07-02 11:57:47 -07:00
Wink Saville
fdb84863b3
Fix NPE if mobile is not supported in checkMobileProvisioning.
...
Bug: 9664438
Change-Id: If0c4938956a80e8d6a21a968aa771d0d8f546b3c
2013-07-02 10:55:14 -07:00
The Android Automerger
be29d7f9ae
merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev
2013-07-02 05:55:24 -07:00
Wink Saville
2e63bb7ef5
Merge commit '68513498' into fix-merge-conflict
...
* commit '68513498':
Add checkMobileProvisioning to ConnectivityService.
Conflicts:
services/java/com/android/server/ConnectivityService.java
Change-Id: Ieceb9c8f4aa4fa99258e56a720b4c74512369458
2013-07-01 16:12:31 -07:00
Wink Saville
68513498e7
am c45f2e05: am 59046f40: Merge "Add checkMobileProvisioning to ConnectivityService." into jb-mr2-dev
...
* commit 'c45f2e05e3b9d261009c66346ef2257ec105f05c':
Add checkMobileProvisioning to ConnectivityService.
2013-07-01 15:41:31 -07:00
Wink Saville
690cb18254
Add checkMobileProvisioning to ConnectivityService.
...
Bug: 9279964
Change-Id: I42c326a21e05aa301e9d974ed9ac1d59472780ec
2013-06-29 21:10:57 -07:00
Lorenzo Colitti
25f5af234f
464xlat: use a gatewayed route, not point-to-point
...
Various applications such as Skype and our legacy VPN code
do not understand routes pointed directly at point-to-point
interfaces and require a default gateway IPv4 address in
order to function.
Grudgingly accept that routes without default gateways Are Hard
and use gatewayed routes instead. This causes routing to go from:
default dev clat4 scope link
to:
default via 192.0.0.4 dev clat4 scope link
192.0.0.4 dev clat4 scope link
and those apps now work.
Bug: 9597256
Bug: 9597516
Change-Id: I7b7890873802d3cb99affd6eb70b8ab75e7a2cf6
2013-06-29 00:14:43 +09:00
John Spurlock
4ba7e413e7
Move battery stats call from SystemUI to system server.
...
The UPDATE_DEVICE_STATS permission is no longer required in sysui.
Change-Id: Icc3120b7873563e3727e56bed9f3b4767da0606d
2013-06-25 10:21:11 -04:00
Jeff Sharkey
cf6e4d80e8
Explicit locale when formatting machine strings.
...
Bug: 9390451
Change-Id: I3581c53407554a1dffd541fb42b06d68f20a7be0
2013-06-11 14:36:41 -07:00
Jeff Sharkey
e9bda1dd68
Accumulate network statistics based on deltas.
...
Network stats are now read out of the kernel in one sweep, instead of
reading per-UID. We now accumulate the delta traffic between each
stats snapshot using the well-tested SamplingCounter pattern.
Since Wi-Fi and mobile traffic have different costs, track each
separately. Avoids counting misc interfaces like loopback and
ethernet under total.
Bug: 5543387
Change-Id: I642004dc530113c27ef79f2abbae51d8af30117f
2013-06-06 14:35:34 -07:00
Andreas Huber
36b169250b
Merge "Fix parsing of global:http_proxy value."
2013-05-28 23:06:30 +00:00
Andreas Huber
9df8955fe1
Fix parsing of global:http_proxy value.
...
This caused a runtime restart for ':' and did not disable the proxy for ""
before.
Change-Id: Ib88b21e9eba5818a4968ae604abad8a3b3d1766f
2013-05-28 15:17:37 -07:00
The Android Open Source Project
fb878f87a7
Reconcile with jb-mr2-release - do not merge
...
Change-Id: I6e813db1760b5f2889fac72f042d82743179cc66
2013-05-28 07:37:29 -07:00
The Android Automerger
cea3bd39c3
merge in jb-mr2-release history after reset to jb-mr2-dev
2013-05-26 05:55:27 -07:00
The Android Open Source Project
4edec272e4
Reconcile with jb-mr2-release - do not merge
...
Change-Id: I0f933138aaf9f70694ef9a326c3db63770a93917
2013-05-24 15:28:19 -07:00
Robert Greenwalt
6a2f4639c6
Use the old interface when resetting connections
...
The new one is often null when disconnected, so using the new fails.
In other situations, it's the connections on the old network we want
to reset anyway, so the old code when it would work would also do
the wrong thing (unless new iface == old iface).
bug:9112928
Change-Id: I1fcae89cc3aa9d712e516e7c97cece0b89869bd9
2013-05-24 12:25:04 -07:00
Robert Greenwalt
3a004ee4a0
am 36a151ab: Merge "Use the old interface when resetting connections" into jb-mr2-dev
...
* commit '36a151abcd794524358a74599a1f4ab130ca7b55':
Use the old interface when resetting connections
2013-05-24 09:24:32 -07:00
Robert Greenwalt
ec8a9e6200
Use the old interface when resetting connections
...
The new one is often null when disconnected, so using the new fails.
In other situations, it's the connections on the old network we want
to reset anyway, so the old code when it would work would also do
the wrong thing (unless new iface == old iface).
bug:9112928
Change-Id: I1fcae89cc3aa9d712e516e7c97cece0b89869bd9
2013-05-23 18:33:06 -07:00
The Android Open Source Project
b2aa01c0dc
Reconcile with jb-mr2-release - do not merge
...
Change-Id: Id3816eec8bf8ceef1883fab3f81803177588eed1
2013-05-16 05:43:31 -07:00
The Android Automerger
4104544a95
merge in jb-mr2-release history after reset to jb-mr2-dev
2013-04-25 05:55:26 -07:00
Wink Saville
7d72bf5622
am d292caf4: Merge "Support WiFi only device at runtime." into jb-mr2-dev
...
* commit 'd292caf445208d79e135963bbbfce3fef18830aa':
Support WiFi only device at runtime.
2013-04-24 08:47:45 -07:00
Wink Saville
d292caf445
Merge "Support WiFi only device at runtime." into jb-mr2-dev
2013-04-24 15:44:08 +00:00
Wink Saville
23ee8db792
Support WiFi only device at runtime.
...
To date WiFi only devices were defined by the list of networkAttributes
in config.xml overriden in on a per-device basis. This change is the
simplest change needed to determine this at runtime and therefore allowing
a single build to support the two different configurations.
Bug: 8562845
Change-Id: I34de5c6accc718b199c13815537de1debfe3dc91
2013-04-23 14:26:51 -07:00
The Android Automerger
e918ff4ed9
merge in jb-mr2-release history after reset to jb-mr2-dev
2013-04-23 05:55:28 -07:00
Robert Greenwalt
7a8f0658c6
am 665c912a: Merge "Listen for network disconnect." into jb-mr2-dev
...
* commit '665c912a4c2c977c6d2e1ea3bbf6bcdf877d6e34':
Listen for network disconnect.
2013-04-23 03:51:08 -07:00
Robert Greenwalt
665c912a4c
Merge "Listen for network disconnect." into jb-mr2-dev
2013-04-22 21:33:29 +00:00
Robert Greenwalt
308b9acca1
Listen for network disconnect.
...
VPN used to just watch the interface, but that is insufficient. There
is no promise that the interface will go down when we're done with it.
Now that wifi stays on in scan-only mode despite user turning it off
it seems that the interface is left up, even in AP mode.
Now listening for ConnectivityService broadcast that the network we were on
has disconnected and tearing down the VPN then or when the interface
goes away.
bug:8550083
Change-Id: Icf414497bc55bead69de04e91f39f90ac2e6578a
2013-04-22 14:13:51 -07:00
The Android Automerger
ee21d8b57b
merge in jb-mr2-release history after reset to jb-mr2-dev
2013-04-22 05:55:37 -07:00
Robert Greenwalt
f95bfb1fa5
am a07f1f2d: Remove STOPSHIP and defer removal.
...
* commit 'a07f1f2d07832eaebe011f018cfbc643cf4a0dbd':
Remove STOPSHIP and defer removal.
2013-04-19 10:17:41 -07:00
Robert Greenwalt
a07f1f2d07
Remove STOPSHIP and defer removal.
...
bug:8657300
Change-Id: Ia855fdc0db7a33502838648ee002d4929b224960
2013-04-19 09:31:24 -07:00
The Android Open Source Project
7174487090
Reconcile with jb-mr2-release - do not merge
...
Change-Id: I618d51505419200bc282404ec2af470be97f1fa7
2013-04-15 10:46:07 -07:00
The Android Automerger
382a281e32
merge in jb-mr2-release history after reset to jb-mr2-dev
2013-04-15 05:55:51 -07:00
Robert Greenwalt
46976c9027
am 3016244f: Merge "Add new route.hasGateway() api" into jb-mr2-dev
...
* commit '3016244ffb0ee59a191b294839468a81b45a01f1':
Add new route.hasGateway() api
2013-04-12 12:07:14 -07:00
Robert Greenwalt
24bc534c2e
Add new route.hasGateway() api
...
Fixes issues brought in by change to isHostRoute. isHostRoute
was technically correct, but the callers really wanted hasNextHop
behavior.
bug:8597268
Change-Id: I360761ccfa98b2ba34642f717a78fa71ec1bae4f
2013-04-12 11:22:52 -07:00
Robert Greenwalt
44bdc908ca
am 10572edb: Merge "Routing workaround." into jb-mr2-dev
...
* commit '10572edbbaa5176518bf8831913b3839e5f95b7f':
Routing workaround.
2013-04-11 16:29:38 -07:00
Robert Greenwalt
10572edbba
Merge "Routing workaround." into jb-mr2-dev
2013-04-11 23:27:20 +00:00
Robert Greenwalt
c5976600f8
am ccbe7e6f: Merge "Use CONNECTIVITY_INTERNAL for global proxy" into jb-mr2-dev
...
* commit 'ccbe7e6ff16fe1afc08f0b8601d83481ba5aee3a':
Use CONNECTIVITY_INTERNAL for global proxy
2013-04-11 14:16:28 -07:00