Commit Graph

2778 Commits

Author SHA1 Message Date
Zoltan Szatmary-Ban
b293e46f2c Data Usage public API
Added new API consisting of android.app.usage.NetworkUsageManager and
android.app.usage.NetworkUsageStats. Through them data usage on a
network interface can be programmatically queried. Both summary and
details are available.

Bug: 19208876
Change-Id: I0e0c4b37ae23ad1e589d4b0c955b93f28ba4333e
2015-03-25 15:53:38 +00:00
The Android Automerger
bde8f08a69 merge in master-release history after reset to master 2015-03-14 01:05:17 -07:00
Wenchao Tong
fccef1da81 NetworkStatsService to adjust VPN stats before recording.
* Creates a new Parcelable class VpnInfo to hold required
  parameters for VPN stats adjustments.
* ConnectivityService to collect infomation and provide
  a list of VpnInfo, one for each user.
* NetworkStatsService passes the VpnInfo array to
  NetworkStatsRecorder.
* NetworkStatsRecorder calls NetworkStats.migrateTun()
  to do the math.
* Poll NetworkStats when the vpn application calls
  setUnderlyingNetworks().

Bug: 19536273
Change-Id: I7a4c7726b8243fead10416f7ec6eb5cf95f20183
2015-03-12 17:43:41 -07:00
Wenchao Tong
0fc8eeb07f Merge "NetworkStats to support VPN accounting." 2015-03-12 22:10:56 +00:00
Wenchao Tong
9ba4d7429b NetworkStats to support VPN accounting.
Create a new method to migrate underlying network traffic
from VPN app to other apps.

Bug: 19536273
Change-Id: I3434cad361592e26b01225edf8012f7b16afc98f
2015-03-09 11:38:10 -07:00
The Android Automerger
3265d9ec0e merge in master-release history after reset to master 2015-03-05 01:01:25 -08:00
John Spurlock
ad5bfa5be8 Remove unused imports in frameworks/base.
Change-Id: I031443de83f93eb57a98863001826671b18f3b17
2015-02-28 14:47:49 -05:00
Qiwen Zhao
54e0c99fe8 Initial empty repository 2014-12-10 14:10:18 -08:00
Jeff Sharkey
1201ce15e2 am 7639e76b: am 2f1e953f: am 4df65bf1: Merge "Direct notification of network interface changes." into lmp-mr1-dev
* commit '7639e76b812f8d9b57eb2680e4d9519ae36fb778':
  Direct notification of network interface changes.
2014-12-09 23:20:26 +00:00
Jeff Sharkey
382a6b06c5 am c54f4ec8: am 5b41696c: am a8fb5803: Merge "Offer to "merge" subscribers for data usage." into lmp-mr1-dev
* commit 'c54f4ec856c057039d87450dd5d3d7fe41d3f162':
  Offer to "merge" subscribers for data usage.
2014-12-09 22:23:19 +00:00
Jeff Sharkey
7639e76b81 am 2f1e953f: am 4df65bf1: Merge "Direct notification of network interface changes." into lmp-mr1-dev
* commit '2f1e953f8fd6d7ee32c00a680f887607f1005f62':
  Direct notification of network interface changes.
2014-12-09 00:18:01 +00:00
Jeff Sharkey
5fb4f650df Direct notification of network interface changes.
Connectivity broadcasts recently changed and are no longer sent for
certain types of network changes.  For example, when stacked network
interfaces change for a mobile network.  To ensure that we pick up
all these details, directly wire the two services together.

Also remove some unused code for split network types.

Bug: 18666753
Change-Id: I0467bd5b330c0e0cb51af2306d821b41ad16337a
2014-12-08 14:50:14 -08:00
Jeff Sharkey
c54f4ec856 am 5b41696c: am a8fb5803: Merge "Offer to "merge" subscribers for data usage." into lmp-mr1-dev
* commit '5b41696c56c124124d48168227a83b63bd55aea7':
  Offer to "merge" subscribers for data usage.
2014-12-08 19:44:27 +00:00
Jeff Sharkey
ae5a8a5ec8 Offer to "merge" subscribers for data usage.
There are some cases where multiple subscriber identities (IMSI)
should be treated as "merged together" from a data usage
perspective.  This is done by extending the template used for
matching purposes to support multiple subscribers.

Then, when we query historical usage or set network policies, we
normalize the matching template to merge to any other identities
that should be included.  When normalizing, the "lowest" identity
is always used for equality and storage purposes, which allows
identities to come and go over time.

This change also fixes data usage recording for multi-SIM devices
by passing along the concrete subscriber identity for each network
interface.  Also correctly create default policies for multi-SIM
devices.  This change also drops setPolicyDataEnable() until it can
be wired up to the right underlying NetworkAgent.  (This means we
still bring up the network, and then rely on iptables rules to block
traffic when over the limit, instead of proactively disabling the
connection.)

Bug: 18012787
Change-Id: If6acf32009fdfea2b836f5aff8e2f3e5e0248b4a
2014-12-08 08:42:59 -08:00
Nick Kralevich
f6e06b3226 resolved conflicts for merge of eb0754b2 to master
Change-Id: Ifcde272f882e55998b16e02cca1e827dec35ce6f
2014-12-02 16:22:57 -08:00
Paul Lawrence
eb0754b2da am 1056d5a9: am 75f304f9: Merge changes Ibfb5c6ab,I712919ae into lmp-mr1-dev
* commit '1056d5a997e3f30230e1e4316310586dd15a4600':
  Add mechanism for securely returning parameters though NativeDaemonConnector
  Revert "DO NOT MERGE: Don't log passwords returned from vdc"
2014-12-02 20:30:01 +00:00
Paul Lawrence
19a1c3f7d9 Add mechanism for securely returning parameters though NativeDaemonConnector
If the first word in the response is {{sensitive}}, don't log the body of the
response.

Bug: 18260068
Change-Id: Ibfb5c6abab1d04b4321cdbcf6c7cf6f18f903146
2014-11-24 10:41:37 -08:00
Paul Lawrence
1e803d5ed0 Revert "DO NOT MERGE: Don't log passwords returned from vdc"
This reverts commit 201c2f73b6.

The original change disabled all logging of RCVed messages in NativeDaemonConnector.
For MR1 we want a much more surgical disabling of sensitive messages. First,
though, we have to defeat the automerger.

Change-Id: I712919aee2db63f7fc0b2c6d6a2a658325dce596
2014-11-24 10:40:15 -08:00
Jeff Sharkey
8dea95b701 am 0d84fe11: am 54c11274: am c0491a2e: Merge "Lightweight checkin output for network stats." into lmp-mr1-dev
* commit '0d84fe11a182ac4b13391ca7e078800af6689a13':
  Lightweight checkin output for network stats.
2014-11-21 23:14:12 +00:00
Jeff Sharkey
0d84fe11a1 am 54c11274: am c0491a2e: Merge "Lightweight checkin output for network stats." into lmp-mr1-dev
* commit '54c11274b5e7ce9f774f7c846d7165563279b96a':
  Lightweight checkin output for network stats.
2014-11-21 22:09:28 +00:00
Andreas Gampe
162ac37980 resolve merge conflicts of 4c35627 to master.
Change-Id: I4d8a7ec4a25471565859050939ec05b0c1261627
2014-11-21 14:05:11 -08:00
Andreas Gampe
4c35627d7d resolved conflicts for merge of 3fc5e3ca to lmp-mr1-dev-plus-aosp
Change-Id: Id8286e5a4381315a6060251a8055b0f1d1a96019
2014-11-21 10:36:14 -08:00
Andreas Gampe
b9fd0471a6 Frameworks/base: Consistency in core/jni
Make consistent use of core_jni_helpers for registration.

Translate some #ifdefs into const bools.

Change-Id: I37639aa053dd50f003a552cbd8550dddecc811c5
2014-11-21 10:15:08 -08:00
Jeff Sharkey
583d956886 Lightweight checkin output for network stats.
Define and print a compact version of network statistics when dump
is requested with the "--checkin" flag.  Defaults to last 24 hours,
but included data can be tweaked with various flags.

Groups together detailed network identities into larger umbrella
terms like "mobile" and "wifi."

Bug: 18415963
Change-Id: I70cf9c828ea5c6e5bb6884837d3608f66fbad2e6
2014-11-21 10:11:10 -08:00
Geoffrey Borggaard
e02280d0ac am fb978eb1: am 8a2ac41d: am 29c0c3be: am c3f5d718: Merge "Fix null handling in proxies." into lmp-dev automerge: 90ed95f
* commit 'fb978eb150358b3fc913e43802c1babf63322833':
  Fix null handling in proxies.
2014-11-21 12:20:00 +00:00
Geoffrey Borggaard
fb978eb150 am 8a2ac41d: am 29c0c3be: am c3f5d718: Merge "Fix null handling in proxies." into lmp-dev automerge: 90ed95f
* commit '8a2ac41dcfa0ec10c09a7599d9345798c21cd47d':
  Fix null handling in proxies.
2014-11-21 10:31:03 +00:00
Geoffrey Borggaard
29c0c3beaa am c3f5d718: Merge "Fix null handling in proxies." into lmp-dev
automerge: 90ed95f

* commit '90ed95faeddf7ebe71320e3e0e80eb17d374e49c':
  Fix null handling in proxies.
2014-11-21 10:17:39 +00:00
Jaewan Kim
c5ac9f7e57 am 710c6e77: am 18ab5c21: Merge "Add an API to check availability of Ethernet interface." into lmp-mr1-dev automerge: 52dcc7f
* commit '710c6e775baa886bbf520470ad9355c169009ceb':
  Add an API to check availability of Ethernet interface.
2014-11-21 03:11:35 +00:00
Jaewan Kim
710c6e775b am 18ab5c21: Merge "Add an API to check availability of Ethernet interface." into lmp-mr1-dev
automerge: 52dcc7f

* commit '52dcc7fb0a17a77c41eddd1517821134946120b1':
  Add an API to check availability of Ethernet interface.
2014-11-21 02:52:28 +00:00
Geoffrey Borggaard
394a29333e Fix null handling in proxies.
ProxyInfo.getPacFileUrl() can not be null.  It will be equal to
Uri.EMPTY.  Checking for null was causing global proxies to never be
disabled.  Or more accurately, global proxies would be disabled, but
would reappear after a reboot.

ProxyInfo.getExclusionListByString() can be null.  If no
exclusion list was specified, the proxy settings would not be
successfully saved, they would disappear after reboot.

Bug: 18453223
Change-Id: I1c27e5dca5b9664bb7468ea909bff489fa110a07
2014-11-20 19:48:20 +00:00
Jaewan Kim
32b3f2ca36 Add an API to check availability of Ethernet interface.
Bug: 18045481
Change-Id: I95358241b431cfe4435ce70c23c9a639b9dc4d58
2014-11-20 11:12:17 +09:00
Andreas Gampe
9a36ec5037 am 8281b720: am 1e765df6: Merge "Frameworks/base: Wall Werror in core/jni"
* commit '8281b720cfba29c574b656a5750dc22b63fe77db':
  Frameworks/base: Wall Werror in core/jni
2014-11-14 19:15:42 +00:00
Andreas Gampe
8281b720cf am 1e765df6: Merge "Frameworks/base: Wall Werror in core/jni"
* commit '1e765df61a22f148d796e62cb0ac3dc36297629e':
  Frameworks/base: Wall Werror in core/jni
2014-11-13 23:35:22 +00:00
Andreas Gampe
1e765df61a Merge "Frameworks/base: Wall Werror in core/jni" 2014-11-13 23:21:36 +00:00
Andreas Gampe
76d0e9f03e Frameworks/base: Wall Werror in core/jni
Turn on -Wall -Werror in core/jni. Fix warnings.

Clang TODO: For GCC we need to turn off Wunused-but-set-variable in
the GL bindings. However, Clang doesn't have that warning and thus
complains about an unknown pragma. It is necessary to make the
pragma #ifdef-ed on the compiler being GCC.

Change-Id: I14cab48d45c2771eef0432082356c47ed44a3d7f
2014-11-13 15:20:37 -08:00
Paul Lawrence
c46548acf9 am 6fbbd274: (-s ours) am 202ab298: am c5ec9fed: am 3bde026a: am afb6b50e: Merge "DO NOT MERGE: Don\'t log passwords returned from vdc" into lmp-dev
* commit '6fbbd2740374235931948b0d06dad03a2af04a6e':
  DO NOT MERGE: Don't log passwords returned from vdc
2014-11-07 03:55:16 +00:00
Paul Lawrence
6fbbd27403 am 202ab298: am c5ec9fed: am 3bde026a: am afb6b50e: Merge "DO NOT MERGE: Don\'t log passwords returned from vdc" into lmp-dev
* commit '202ab2986c2ab61ea32845ea94af6e329c1fd83c':
  DO NOT MERGE: Don't log passwords returned from vdc
2014-11-07 00:06:25 +00:00
Paul Lawrence
c5ec9fed69 am 3bde026a: am afb6b50e: Merge "DO NOT MERGE: Don\'t log passwords returned from vdc" into lmp-dev
* commit '3bde026aebffdaea8ab1315977b05e53e4a75185':
  DO NOT MERGE: Don't log passwords returned from vdc
2014-11-06 20:34:49 +00:00
Paul Lawrence
201c2f73b6 DO NOT MERGE: Don't log passwords returned from vdc
Turns off logging of responses from native daemon connector altogether.
Proper solution to follow in LMP MR1

Bug: 18260068
Change-Id: I25bc9cb61049a3efdd9a9cd11195864a04ef05fd
2014-11-05 19:07:57 -08:00
Jeff Sharkey
53e8283bb1 am 99bbaa60: Merge "Drop DEV network stats to save RAM." into lmp-mr1-dev automerge: 49c1527 automerge: a5921b9
* commit '99bbaa609e63bb5c425d66f118f42fce8c58bac9':
  Drop DEV network stats to save RAM.
2014-10-28 07:16:34 +00:00
Jeff Sharkey
99bbaa609e Merge "Drop DEV network stats to save RAM." into lmp-mr1-dev automerge: 49c1527
automerge: a5921b9

* commit 'a5921b9b79a1d95e8a41bd74998cab82b153cb0a':
  Drop DEV network stats to save RAM.
2014-10-28 00:27:07 +00:00
Bill Yi
4d4d7a14a6 am 1aa4c271: (-s ours) am 5a71f832: (-s ours) Merge lmp-dev-plus-aosp-without-vendor into stage-aosp-master
* commit '1aa4c271fe5095336367d9a360882c829c0a7d40':
2014-10-27 04:19:54 +00:00
Bill Yi
1aa4c271fe am 5a71f832: (-s ours) Merge lmp-dev-plus-aosp-without-vendor into stage-aosp-master
* commit '5a71f83227f0340a265f34b226d8fe01d4dd9773':
2014-10-27 02:50:36 +00:00
Jeff Sharkey
90c441a71c Drop DEV network stats to save RAM.
We migrated to pure XT stats a long time ago, so we no longer need
to keep the DEV stats cached in RAM.  This saves ~250KB on a typical
device.

Bug: 18118003
Change-Id: I3d84ba47073fa3500454784afc956c8e53404492
2014-10-24 13:15:15 -07:00
Jeff Sharkey
b5e2e3047f am b0afc04d: am d4a9f511: am eec860ae: am a7b20bba: am bfd9a30f: Merge "NetworkStats always needs arrays." into lmp-dev
* commit 'b0afc04d71d5c37cfef34a48f40d7fb6b08cb51e':
2014-09-19 07:44:24 +00:00
Jeff Sharkey
b5296b615b am d4a9f511: am eec860ae: am a7b20bba: am bfd9a30f: Merge "NetworkStats always needs arrays." into lmp-dev
* commit 'd4a9f511ba4e960836d951efeaa1a672d8869a32':
  NetworkStats always needs arrays.
2014-09-17 19:48:17 +00:00
Jeff Sharkey
aa420b146b am 51420c63: am bfd9a30f: Merge "NetworkStats always needs arrays." into lmp-dev
* commit '51420c63918de8db44084b04c155448c3fd25362':
  NetworkStats always needs arrays.
2014-09-17 19:25:08 +00:00
Jeff Sharkey
8e9afdf05f NetworkStats always needs arrays.
Internal logic relies on Arrays.copyOf(), so always give ourselves
valid arrays, using shared empty objects to save overhead.

Bug: 17502649
Change-Id: I5dbb00545bdfe45bbd48144ab505ea08cc92cbcd
2014-09-17 09:26:31 -07:00
Christopher Lane
4d85e0219f am 614c653b: am 1fdb5100: Merge "Handle null values in registerService" into lmp-dev
* commit '614c653b7a2da14ded7d9c95142a5afd0b4d4722':
  Handle null values in registerService
2014-09-14 17:25:44 +00:00
Christopher Lane
45cc2ce6ed Handle null values in registerService
Bug: 17491971
Change-Id: I0443a9accd86ab70510d16456a03912845718ca9
2014-09-13 11:18:33 -07:00