LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,961 Commits 2 Branches 0 Tags
5b0e313699d88fe813d8529f9b538cc28b571550
Commit Graph

1961 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Adam Lesinski
5b0e313699 Merge "Adding per UID WiFi power distribution." 2015-04-07 01:53:00 +00:00
Adam Lesinski
5ab174bac0 Adding per UID WiFi power distribution. 
Change-Id: Ia3d97e0a1c3352127185c18626d8ba8221c9ab40
 2015-04-06 18:36:06 -07:00
Chong Zhang
db4bbfecdd Merge "fix the flash caused by missing setMatrix() when surface size changes" 2015-04-06 21:35:15 +00:00
Robert Greenwalt
6ee271c0b3 am 0270d86a: am 778f47e5: am 069f4cbc: Merge "Fix memory leak in Connectivity Service when phone app crashes" 
* commit '0270d86ab755dabb7d20013dcb591d3facbe1a08':
  Fix memory leak in Connectivity Service when phone app crashes
 2015-04-06 18:17:28 +00:00
Maunik Shah
d1027f5338 Fix memory leak in Connectivity Service when phone app crashes 
Upon crash of com.android.phone process, NetworkFactoryInfo is
not getting removed from HashMap and will get accumulated on
every start of the process.

Change-Id: Iafde28daddfc82728c03208522682b1efc85a121
 2015-04-04 21:48:24 +05:30
Stuart Scott
0f835acb91 Move reset network settings into framework. 
bug: 16161518
Change-Id: Ic3b537ebd09d1b9723feff9dcc96e20fda05a94f
 2015-03-30 18:02:55 -07:00
The Android Automerger
b254d603ad merge in master-release history after reset to master 2015-03-28 01:05:55 -07:00
Wenchao Tong
fdf2267b50 Keep debug information in NetworkStats files 
Create two special SETs.

SET_DBG_VPN_IN is used by individual applications to know
how much traffic of the NetworkIdentity was actually moved
from a VPN app.
SET_DBG_VPN_OUT is used by the VPN app to know how much
traffic of the NetworkIdentity was deducted.

A debug application can restore the raw stats by these
entries.
  raw_traffic = recorded_entry (TAG_NONE, SET_ALL)
              + recorded_entry (TAG_NONE, SET_DBF_VPN_OUT)
              - recorded_entry (TAG_NONE, SET_DBF_VPN_IN)

The two debug SETs are not returned by
NetworkStatsService.openSession(). These debug entries are
retrieved by NetworkStatsCollection.dump().

Bug: 19536273
Change-Id: I03ef9f7667f5f2f48cbe3f6b11447fe7ead8ad3b
 2015-03-27 13:49:13 -07:00
The Android Automerger
feba983610 merge in master-release history after reset to master 2015-03-26 01:03:50 -07:00
Prerepa Viswanadham
5d4c045bcf Merge remote-tracking branch 'goog/mirror-m-wireless-internal-release' into master_merge 
Change-Id: I49aab437af220f1139cfd2d0a9c362acce31074e
 2015-03-24 13:46:08 -07:00
The Android Automerger
97966560e1 merge in master-release history after reset to master 2015-03-21 01:03:05 -07:00
Paul Jensen
703642c635 Merge "Make NetworkCapabilities.NOT_VPN javadoc visible." into m-wireless-dev 2015-03-20 11:27:18 +00:00
Lorenzo Colitti
ddf811b950 Add a protectFromVpn method that takes a FileDescriptor 
Bug: 19704592
Change-Id: I9aeb29c2f6cf55fa010bc606c99b21a797ac5a19
 2015-03-20 16:32:40 +09:00
Lorenzo Colitti
06b991f444 DHCP: Add a native method for making a DHCP socket. 
Bug: 19704592
Change-Id: Iadd60d39c93aaabd2917e76791101a7d313b34be
 2015-03-20 16:32:35 +09:00
Lorenzo Colitti
2af6f557df Add two utility methods for IPv4 netmasks. 
1. Add a validating method to convert a netmask to a prefix length.
2. Add a function to get the implicit netmask of an IPv4 address.
3. Add a unit test.

Bug: 19704592
Change-Id: Icb9f58d3903ea01df9e3720383c9bd5db6dd8f26
 2015-03-20 16:32:34 +09:00
The Android Automerger
8a0989c3da merge in master-release history after reset to master 2015-03-19 01:04:31 -07:00
Alan Viverette
501ecd6dac Replace usages of deprecated Resources.getColor() and getColorStateList() 
Change-Id: I8f64fe6c4c44a92ff6d07250223ba590a1d691b0
 2015-03-18 18:37:18 -07:00
Paul Jensen
8357dfd520 Remove dead code, mostly DataStateTracker. 
(cherry picked from AOSP commit 9edb1fc511)

Change-Id: I18c44cd08dfb51e02a96d0b726e9af1db21e3058
 2015-03-18 12:29:13 -04:00
Paul Jensen
ba9c42f661 Make NetworkCapabilities.NOT_VPN javadoc visible. 
Also adjust wording to be more suitable for NetworkRequests and NetworkAgents.

Change-Id: I1cc93cb20779cf02d6ffa0fa11ad2916c199b365
 2015-03-18 09:33:07 -04:00
The Android Automerger
96c6021c19 merge in master-release history after reset to master 2015-03-18 01:02:56 -07:00
Erik Kline
5ccaadee2e Merge "Fix missing printf argument." into m-wireless-dev 2015-03-18 00:18:41 +00:00
Erik Kline
d687dc5da9 Fix missing printf argument. 
Change-Id: Ifd1eebfbcefa06570882da54a1c410eabf26bce7
 2015-03-18 08:41:42 +09:00
Erik Kline
94500b2aae Fix missing printf argument. 
Change-Id: Ifd1eebfbcefa06570882da54a1c410eabf26bce7
 2015-03-18 08:08:57 +09:00
Lorenzo Colitti
b85f0b44a7 Add a protectFromVpn method that takes a FileDescriptor 
Bug: 19704592
Change-Id: I9aeb29c2f6cf55fa010bc606c99b21a797ac5a19
 2015-03-17 19:46:12 +09:00
The Android Automerger
8d02cf0c6f merge in master-release history after reset to master 2015-03-17 01:03:04 -07:00
Lorenzo Colitti
1271037d00 Merge changes from topic 'dhcpclient' into m-wireless-dev 
* changes:
  DHCP: Minor cleanups to the packet code.
  DHCP: Move the packet code to frameworks/base/services.
  DHCP: Add a native method for making a DHCP socket.
  DHCP: Add a superclass for DhcpStateMachine.
 2015-03-16 12:12:42 +00:00
Lorenzo Colitti
0210a8c5d9 Merge "Add two utility methods for IPv4 netmasks." into m-wireless-dev 2015-03-16 12:11:37 +00:00
Lorenzo Colitti
c70fbac892 DHCP: Add a native method for making a DHCP socket. 
Bug: 19704592
Change-Id: Iadd60d39c93aaabd2917e76791101a7d313b34be
 2015-03-16 20:08:45 +09:00
Lorenzo Colitti
e82e0f0a8c Add two utility methods for IPv4 netmasks. 
1. Add a validating method to convert a netmask to a prefix length.
2. Add a function to get the implicit netmask of an IPv4 address.
3. Add a unit test.

Bug: 19704592
Change-Id: Icb9f58d3903ea01df9e3720383c9bd5db6dd8f26
 2015-03-16 16:07:36 +09:00
Vinit Deshpande
8d1c3be573 am "Refactor NetworkUtils interaction with DHCP." 
merged from goog/mirror-m-wireless-internal-release
9def7be Refactor NetworkUtils interaction with DHCP.
 2015-03-15 13:40:27 -07:00
The Android Automerger
9980c6e402 merge in master-release history after reset to master 2015-03-14 01:05:17 -07:00
Paul Jensen
051135c956 Fix javadoc braces for ConnectivityManager.EXTRA_NETWORK. 
Change-Id: I5ad30a34f96e9e99a557b5bae9a30bfc08c89620
 2015-03-13 14:06:12 -04:00
Lorenzo Colitti
6f7cccbc71 am 4a61eaf7: am 342a2a9a: Merge "Fix build, broken by https://android-review.googlesource.com/#/c/115890/" 
* commit '4a61eaf784fb085e66a21e9e4d4fa8aeb6b41c2b':
  Fix build, broken by https://android-review.googlesource.com/#/c/115890/
 2015-03-13 07:07:54 +00:00
Andreas Gampe
8679a46283 resolved conflicts for merge of b6b9fe21 to master 
Change-Id: If4f62aa1fd8bb774288a677e7008e86a7e3ea6d9
 2015-03-13 00:04:10 -07:00
Wenchao Tong
e164e0063b 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
79ec5b8656 Merge "NetworkStats to support VPN accounting." 2015-03-12 22:10:56 +00:00
Lorenzo Colitti
342a2a9a6c Merge "Fix build, broken by https://android-review.googlesource.com/#/c/115890/" 2015-03-12 07:49:23 +00:00
Lorenzo Colitti
a897c84357 Fix build, broken by https://android-review.googlesource.com/#/c/115890/ 
Change-Id: Ieafa2fb0a7f539d8f933ad9c98e3be80457da6e5
 2015-03-12 16:48:12 +09:00
Paul Jensen
9edb1fc511 Remove dead code, mostly DataStateTracker. 
Change-Id: I1433937bffdb29bd42fb1adbfcf0a50ceffac7dd
 2015-03-11 10:03:58 -04:00
Wenchao Tong
7352b6df64 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
dc9216187f merge in master-release history after reset to master 2015-03-05 01:01:25 -08:00
The Android Automerger
b5777e7b64 merge in master-release history after reset to master 2015-03-04 09:28:06 -08:00
The Android Automerger
d1a5a681eb merge in master-release history after reset to master 2015-03-03 01:01:19 -08:00
Erik Kline
9def7be67d Refactor NetworkUtils interaction with DHCP. 
Separate out starting DHCP (DISCOVER) and RENEW operations from fetching
the results.  Add NetworkUtils.getDhcpResults(), to enable quick checks
of any available DhcpResults without extraneous interaction with the
DHCP daemon.

Bug: 19422416
Change-Id: I58808e529dda8429737e749f5caef56d923c0809
 2015-03-02 12:35:35 +09:00
John Spurlock
c3c163f3f4 Remove unused imports in frameworks/base. 
Change-Id: I031443de83f93eb57a98863001826671b18f3b17
 2015-02-28 14:47:49 -05:00
The Android Automerger
097477c906 merge in master-release history after reset to master 2015-02-14 01:03:45 -08:00
Narayan Kamath
3473245e45 Merge "Move apache specific portions of android.net.http to external/apache-http." 2015-02-13 09:51:44 +00:00
Jeremy Joslin
472032a647 Merge branch 'master' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base 2015-02-12 19:40:58 +00:00
Jeremy Joslin
3aee237f28 am 0992f962: am 1267462c: am f456d4dc: am d4d604e2: Merge "Update Javadoc for EXTRA_NETWORK." into lmp-mr1-dev 
* commit '0992f962468e28bd6798581cb768dc7226dcdfb4':
  Update Javadoc for EXTRA_NETWORK.
 2015-02-12 19:40:48 +00:00
Jeremy Joslin
3337a69ecc am 1267462c: am f456d4dc: am d4d604e2: Merge "Update Javadoc for EXTRA_NETWORK." into lmp-mr1-dev 
automerge: 0992f96

* commit '0992f962468e28bd6798581cb768dc7226dcdfb4':
  Update Javadoc for EXTRA_NETWORK.
 2015-02-12 19:39:20 +00:00