Commit graph

13,045 commits

Message SHA1
merge in klp-release history after reset to master
The Android Automerger   commited 2013-07-09 06:00:45 -07:00
e906fadb8a
am 29dd8449: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge
* commit '29dd8449e6':

The Android Open Source Project   authored and   Android Git Automerger   commited 2013-07-08 15:52:24 -07:00
5c0dd380d0
Reconcile with jb-mr2-zeroday-release - do not merge
Change-Id: Id0d9eb3205906b409e735546b988f43a3bdcc0ae

The Android Open Source Project   commited 2013-07-08 15:33:43 -07:00
29dd8449e6
merge in klp-release history after reset to master
The Android Automerger   commited 2013-07-08 06:00:54 -07:00
40a15ad43c
merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev
The Android Automerger   commited 2013-07-08 05:55:31 -07:00
ccf8df7dec
am d25b6b73: (-s ours) Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge
* commit 'd25b6b7372':
  Expose latency methods through AudioManager and AudioTrack.
  Fix  NPE if mobile is not supported in checkMobileProvisioning.
  Temporarily disable 'Scan Always' mode

The Android Open Source Project   authored and   Android Git Automerger   commited 2013-07-03 08:53:48 -07:00
013df9a0a7
Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge
Change-Id: I343bd8f6d948c90cd5cede9dc160c86ebce6501c

The Android Open Source Project   commited 2013-07-03 08:51:11 -07:00
d25b6b7372
am ef5c31ae: am db011499: am 753d754c: Merge "Fix NPE if mobile is not supported in checkMobileProvisioning." into jb-mr2-dev
* commit 'ef5c31ae3e':
  Fix  NPE if mobile is not supported in checkMobileProvisioning.

Wink Saville   authored and   The Android Automerger   commited 2013-07-02 15:56:45 -07:00
a3ef83cc3c
am ef5c31ae: am db011499: am 753d754c: Merge "Fix NPE if mobile is not supported in checkMobileProvisioning." into jb-mr2-dev
* commit 'ef5c31ae3e':
  Fix  NPE if mobile is not supported in checkMobileProvisioning.

Wink Saville   authored and   Android Git Automerger   commited 2013-07-02 12:41:31 -07:00
b72702da1f
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.

Wink Saville   authored and   Android Git Automerger   commited 2013-07-02 12:36:47 -07:00
ef5c31ae3e
Fix NPE if mobile is not supported in checkMobileProvisioning.
Bug: 9664438
Change-Id: If0c4938956a80e8d6a21a968aa771d0d8f546b3c

Wink Saville   authored and   The Android Automerger   commited 2013-07-02 11:57:47 -07:00
ec5eb01134
Fix NPE if mobile is not supported in checkMobileProvisioning.
Bug: 9664438
Change-Id: If0c4938956a80e8d6a21a968aa771d0d8f546b3c

Wink Saville   commited 2013-07-02 10:55:14 -07:00
fdb84863b3
merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev
The Android Automerger   commited 2013-07-02 05:55:24 -07:00
be29d7f9ae
Merge commit '68513498' into fix-merge-conflict
* commit '68513498':
  Add checkMobileProvisioning to ConnectivityService.

Conflicts:
	services/java/com/android/server/ConnectivityService.java

Change-Id: Ieceb9c8f4aa4fa99258e56a720b4c74512369458

Wink Saville   commited 2013-07-01 16:12:31 -07:00
2e63bb7ef5
am c45f2e05: am 59046f40: Merge "Add checkMobileProvisioning to ConnectivityService." into jb-mr2-dev
* commit 'c45f2e05e3b9d261009c66346ef2257ec105f05c':
  Add checkMobileProvisioning to ConnectivityService.

Wink Saville   authored and   Android Git Automerger   commited 2013-07-01 15:41:31 -07:00
68513498e7
Add checkMobileProvisioning to ConnectivityService.
Bug: 9279964
Change-Id: I42c326a21e05aa301e9d974ed9ac1d59472780ec

Wink Saville   commited 2013-06-29 21:10:57 -07:00
690cb18254
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

Lorenzo Colitti   commited 2013-06-29 00:14:43 +09:00
25f5af234f
Move battery stats call from SystemUI to system server.
The UPDATE_DEVICE_STATS permission is no longer required in sysui.

Change-Id: Icc3120b7873563e3727e56bed9f3b4767da0606d

John Spurlock   commited 2013-06-25 10:21:11 -04:00
4ba7e413e7
Explicit locale when formatting machine strings.
Bug: 9390451
Change-Id: I3581c53407554a1dffd541fb42b06d68f20a7be0

Jeff Sharkey   commited 2013-06-11 14:36:41 -07:00
cf6e4d80e8
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

Jeff Sharkey   commited 2013-06-06 14:35:34 -07:00
e9bda1dd68
Merge "Fix parsing of global:http_proxy value."
Andreas Huber   authored and   Android (Google) Code Review   commited 2013-05-28 23:06:30 +00:00
36b169250b
Fix parsing of global:http_proxy value.
This caused a runtime restart for ':' and did not disable the proxy for ""
before.

Change-Id: Ib88b21e9eba5818a4968ae604abad8a3b3d1766f

Andreas Huber   commited 2013-05-28 15:17:37 -07:00
9df8955fe1
Reconcile with jb-mr2-release - do not merge
Change-Id: I6e813db1760b5f2889fac72f042d82743179cc66

The Android Open Source Project   commited 2013-05-28 07:37:29 -07:00
fb878f87a7
merge in jb-mr2-release history after reset to jb-mr2-dev
The Android Automerger   commited 2013-05-26 05:55:27 -07:00
cea3bd39c3
Reconcile with jb-mr2-release - do not merge
Change-Id: I0f933138aaf9f70694ef9a326c3db63770a93917

The Android Open Source Project   commited 2013-05-24 15:28:19 -07:00
4edec272e4
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

Robert Greenwalt   authored and   The Android Automerger   commited 2013-05-24 12:25:04 -07:00
6a2f4639c6
am 36a151ab: Merge "Use the old interface when resetting connections" into jb-mr2-dev
* commit '36a151abcd794524358a74599a1f4ab130ca7b55':
  Use the old interface when resetting connections

Robert Greenwalt   authored and   Android Git Automerger   commited 2013-05-24 09:24:32 -07:00
3a004ee4a0
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

Robert Greenwalt   commited 2013-05-23 18:33:06 -07:00
ec8a9e6200
Reconcile with jb-mr2-release - do not merge
Change-Id: Id3816eec8bf8ceef1883fab3f81803177588eed1

The Android Open Source Project   commited 2013-05-16 05:43:31 -07:00
b2aa01c0dc
merge in jb-mr2-release history after reset to jb-mr2-dev
The Android Automerger   commited 2013-04-25 05:55:26 -07:00
4104544a95
am d292caf4: Merge "Support WiFi only device at runtime." into jb-mr2-dev
* commit 'd292caf445':
  Support WiFi only device at runtime.

Wink Saville   authored and   Android Git Automerger   commited 2013-04-24 08:47:45 -07:00
7d72bf5622
Merge "Support WiFi only device at runtime." into jb-mr2-dev
Wink Saville   authored and   Android (Google) Code Review   commited 2013-04-24 15:44:08 +00:00
d292caf445
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

Wink Saville   commited 2013-04-23 14:26:51 -07:00
23ee8db792
merge in jb-mr2-release history after reset to jb-mr2-dev
The Android Automerger   commited 2013-04-23 05:55:28 -07:00
e918ff4ed9
am 665c912a: Merge "Listen for network disconnect." into jb-mr2-dev
* commit '665c912a4c':
  Listen for network disconnect.

Robert Greenwalt   authored and   Android Git Automerger   commited 2013-04-23 03:51:08 -07:00
7a8f0658c6
Merge "Listen for network disconnect." into jb-mr2-dev
Robert Greenwalt   authored and   Android (Google) Code Review   commited 2013-04-22 21:33:29 +00:00
665c912a4c
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

Robert Greenwalt   commited 2013-04-22 14:13:51 -07:00
308b9acca1
merge in jb-mr2-release history after reset to jb-mr2-dev
The Android Automerger   commited 2013-04-22 05:55:37 -07:00
ee21d8b57b
am a07f1f2d: Remove STOPSHIP and defer removal.
* commit 'a07f1f2d07':
  Remove STOPSHIP and defer removal.

Robert Greenwalt   authored and   Android Git Automerger   commited 2013-04-19 10:17:41 -07:00
f95bfb1fa5
Remove STOPSHIP and defer removal.
bug:8657300
Change-Id: Ia855fdc0db7a33502838648ee002d4929b224960

Robert Greenwalt   commited 2013-04-19 09:31:24 -07:00
a07f1f2d07
Reconcile with jb-mr2-release - do not merge
Change-Id: I618d51505419200bc282404ec2af470be97f1fa7

The Android Open Source Project   commited 2013-04-15 10:46:07 -07:00
7174487090
merge in jb-mr2-release history after reset to jb-mr2-dev
The Android Automerger   commited 2013-04-15 05:55:51 -07:00
382a281e32
am 3016244f: Merge "Add new route.hasGateway() api" into jb-mr2-dev
* commit '3016244ffb0ee59a191b294839468a81b45a01f1':
  Add new route.hasGateway() api

Robert Greenwalt   authored and   Android Git Automerger   commited 2013-04-12 12:07:14 -07:00
46976c9027
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

Robert Greenwalt   commited 2013-04-12 11:22:52 -07:00
24bc534c2e
am 10572edb: Merge "Routing workaround." into jb-mr2-dev
* commit '10572edbba':
  Routing workaround.

Robert Greenwalt   authored and   Android Git Automerger   commited 2013-04-11 16:29:38 -07:00
44bdc908ca
Merge "Routing workaround." into jb-mr2-dev
Robert Greenwalt   authored and   Android (Google) Code Review   commited 2013-04-11 23:27:20 +00:00
10572edbba
am ccbe7e6f: Merge "Use CONNECTIVITY_INTERNAL for global proxy" into jb-mr2-dev
* commit 'ccbe7e6ff16fe1afc08f0b8601d83481ba5aee3a':
  Use CONNECTIVITY_INTERNAL for global proxy

Robert Greenwalt   authored and   Android Git Automerger   commited 2013-04-11 14:16:28 -07:00
c5976600f8
Use CONNECTIVITY_INTERNAL for global proxy
The Global http proxy shouldn't be used by apps, but can be useful in certain
conditions.

bug:8264794
bug:8557674
Change-Id: Ia3cbe542e448d9e74d0492626a13e9fd34ad797a

Robert Greenwalt   commited 2013-04-10 15:32:18 -07:00
aa4677cfa0
Reconcile with jb-mr2-release - do not merge
Change-Id: I3f174e8a8e79b7f7ab1ced7ba665c538183948f2

The Android Open Source Project   commited 2013-04-10 10:05:34 -07:00
c680df2b0b
merge in jb-mr2-release history after reset to jb-mr2-dev
The Android Automerger   commited 2013-04-10 05:56:05 -07:00
5ff0d2c0b2