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

1776 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Lorenzo Colitti
6b4985d8fd Fix reboot loop. 
The multinetwork branch is rebooting on startup with:

E/AndroidRuntime( 1024): *** FATAL EXCEPTION IN SYSTEM PROCESS: NetworkStats
[...]
E/AndroidRuntime( 1024): Caused by: java.lang.NullPointerException: Attempt to read from field 'long android.net.NetworkCapabilities.mNetworkCapabilities' on a null object reference
E/AndroidRuntime( 1024): 	at android.net.NetworkCapabilities.<init>(NetworkCapabilities.java:235)
E/AndroidRuntime( 1024): 	at android.net.BaseNetworkStateTracker.getNetworkCapabilities(BaseNetworkStateTracker.java:103)
E/AndroidRuntime( 1024): 	at com.android.server.ConnectivityService.getAllNetworkState(ConnectivityService.java:1134)
E/AndroidRuntime( 1024): 	at com.android.server.net.NetworkStatsService.updateIfacesLocked(NetworkStatsService.java:877)
E/AndroidRuntime( 1024): 	at com.android.server.net.NetworkStatsService.updateIfaces(NetworkStatsService.java:849)
E/AndroidRuntime( 1024): 	at com.android.server.net.NetworkStatsService.access$600(NetworkStatsService.java:139)
E/AndroidRuntime( 1024): 	at com.android.server.net.NetworkStatsService$2.onReceive(NetworkStatsService.java:717)
E/AndroidRuntime( 1024): 	at android.app.LoadedApk$ReceiverDispatcher$Args.run(LoadedApk.java:766)
E/AndroidRuntime( 1024): 	... 4 more

This seems to be due to NetworkCapabilities' copy constructor
not null-checking its argument.  Unbreak things by ignoring null.

Change-Id: Iff3c38e6d72390fa86e51bfce534ebd42a262e19
 2014-05-12 18:06:47 -07:00
Robert Greenwalt
d6ee688546 Add NetworkRequest to the multinetwork API 
bug:13885501
Change-Id: I7b9a01aadf26b6ff104d088b6e283c838ec4dfac
 2014-05-12 17:52:48 -07:00
Robert Greenwalt
3e0c794056 Replace LinkCapabilities with NetworkCapabilities 
Also remove unused LinkSocket and LinkSocketNotifier.
bug:13885501

Change-Id: Id426e31b201fa4f29109b5fea485d8efb34519d3
 2014-05-12 16:52:56 -07:00
Jason Monk
19c6561c50 Switch PacUrl storage from String to Uri 
Since the interface for creating/accessing PAC URLs through a
ProxyInfo is Uri based, so should the internal storage and
references.

Change-Id: Ibf15c350f4cc526f81aba3ec463070f26af8f535
 2014-05-12 15:44:32 -04:00
Robert Greenwalt
52cd9bfc48 Add NetworkCapabilities part of API. 
Merging to master, adding @hide until we're ready to reveal the API change.

bug:13885501
Change-Id: Ib40e28092e092630bfec557bde77f58eec8ae1c8
 2014-05-12 12:12:57 -07:00
Robert Greenwalt
42a0e1ee84 First pass on multinetwork framework 
Starting to switch netd to use NetId.
Adding the Network identifying class

bug:13550136
Change-Id: Ie0db4fb17c9300bfafb63329adfa02339911b33d
 2014-05-12 10:59:44 -07:00
The Android Automerger
cc2a1d0be9 merge in master-release history after reset to 133d4e9291bb62658c6f9bf37ce914578f9d50e7 2014-05-10 05:50:28 -07:00
Jason Monk
c8b9171607 Fix Global Proxy when used with PAC 
Since PAC needs to relay the local proxy port back to the
ConnectivityService it ends up calling handleApplyDefaultProxy...
This works fine for PAC on WiFi, but when tested on global proxy
(not currently used anywhere), it sets the mDefaultProxy.  This
mDefaultProxy does not get cleared when the global proxy is cleared
and requires a reboot to get things cleared out.

This CL adds a check to overwrite mGlobalProxy rather than
mDefaultProxy in this use case.

Change-Id: I92782d11e213b91f8ddda2faaf996a7252273fc3
 2014-05-08 13:46:26 -04:00
The Android Automerger
758ea3f606 merge in master-release history after reset to 20d80a4a05249fca9f4aa6c80b61a1f7a9e18dd0 2014-05-08 05:50:24 -07:00
Jason Monk
8418250186 Merge "Fix Docs breakage" 2014-05-07 23:16:02 +00:00
Jason Monk
0adf31f4b8 Fix Docs breakage 
Change-Id: Idaa57d16165203ad38143e493552ddf8a1ff56e5
 2014-05-07 18:41:13 -04:00
Jason Monk
10af9feb98 Merge "Make proxy API public" 2014-05-07 18:54:12 +00:00
Jason Monk
4d5e20f870 Make proxy API public 
Also exposed proxy-related functions that were on the
ConnectivityManager.

Change-Id: I9fb5f1bcc257a6198679ea1d56e18da2ec5a3b33
 2014-05-07 14:23:53 -04:00
The Android Automerger
336e83bb2a merge in master-release history after reset to 2e1bb94421d996a45cbc2e5472a0fdaa3e2b921c 2014-05-04 05:49:50 -07:00
The Android Automerger
681f2c58fd merge in master-release history after reset to a5408fc31d7cfff8d55b8bb301cf5c3450a8ebfa 2014-05-01 05:50:13 -07:00
Bill Yi
ec70b6cde8 am cf656657: am d9951c00: (-s ours) Merge commit \'0b62467b142b61ee1e449ba958ba37dfd961ef56\' into HEAD 
* commit 'cf6566575dbab768dee45a7bea1be1d761a5efac':
  Update framework to use M33 Skia. DO NOT MERGE
 2014-04-30 12:51:01 +00:00
Bill Yi
cf6566575d am d9951c00: (-s ours) Merge commit \'0b62467b142b61ee1e449ba958ba37dfd961ef56\' into HEAD 
* commit 'd9951c00d44532b2b90a1e0c94ccc708f7b032f5':
  Update framework to use M33 Skia. DO NOT MERGE
 2014-04-30 01:19:37 +00:00
Bill Yi
d9951c00d4 Merge commit '0b62467b142b61ee1e449ba958ba37dfd961ef56' into HEAD 2014-04-29 16:07:29 -07:00
The Android Automerger
12916fb5f8 merge in master-release history after reset to 545d0fa0d225d8b95b4f1d69a7fa8b2080543dad 2014-04-29 05:50:25 -07:00
Elliott Hughes
d48bb67aac resolved conflicts for merge of e6ae3be8 to master 
Change-Id: Id5c5997ad8f801b32e1dbd97413ea42e38c27210
 2014-04-28 13:53:25 -07:00
Elliott Hughes
e6ae3be829 am 685a0a72: am bbd87eb9: Merge "Track libcore.os\' move to android.system." 
* commit '685a0a72d445515167a2071330679cdf9b53a62d':
  Track libcore.os' move to android.system.
 2014-04-28 18:36:53 +00:00
Elliott Hughes
8732b35f51 Track libcore.os' move to android.system. 
(This is partial, but should cover everything in AOSP master except
for the zygote.)

Change-Id: I1042c99245765746a744c44e714095cb2c6cb75d
 2014-04-28 11:11:32 -07:00
The Android Automerger
76b86a0c16 merge in master-release history after reset to master 2014-04-15 05:49:56 -07:00
Christopher Lane
bbf3eb56b6 resolved conflicts for merge of 381ac080 to master 
Change-Id: I779c49c48980ba7737ee4e7b04a9e4c3e02fca21
 2014-04-14 15:14:01 -07:00
Christopher Lane
6d1b0b70af Add support for custom TXT records in NSD 
Change-Id: I8e6dc9852ad4d273c71ad6a63a7fbd28a206806d
 2014-04-14 14:10:36 -07:00
The Android Automerger
3e8c6b4d65 merge in master-release history after reset to master 2014-04-08 05:49:48 -07:00
Robert Greenwalt
69094d47a8 am 4455c599: (-s ours) am f2bc5157: am e1d4847c: am eddae63a: am 9932c297: (-s ours) am f9e24b30: am b0f4f4d7: am 2cc9ee1c: (-s ours) am 2c90609c: am 339cfdbd: am 72f9b308: am 7d574493: am 1600a26e: am 7f6d1ef7: am 8eac056f: DO NOT MERGE Sanitize WifiConfigs 
* commit '4455c5999f72daaf6f15c4394e413976f14337d3':
  DO NOT MERGE Sanitize WifiConfigs
 2014-04-07 20:59:05 +00:00
Robert Greenwalt
21a4874d2e am f00b906f: (-s ours) am 00790e4f: am c855a28a: am e630a073: am 4342c3d6: (-s ours) am 8f2cf6a9: am 39e9ece0: am b3efa6a3: (-s ours) am 106627e0: am e42ce676: am ebf23a8d: am 8a1be0be: am 3c417fbf: Merge "DO NOT MERGE Sanitize WifiConfigs" into jb-mr1-dev 
* commit 'f00b906f01319a8177d2e2ab109ff01016b0bf4c':
  DO NOT MERGE Sanitize WifiConfigs
 2014-04-07 20:50:46 +00:00
Robert Greenwalt
f2bc515719 am e1d4847c: am eddae63a: am 9932c297: (-s ours) am f9e24b30: am b0f4f4d7: am 2cc9ee1c: (-s ours) am 2c90609c: am 339cfdbd: am 72f9b308: am 7d574493: am 1600a26e: am 7f6d1ef7: am 8eac056f: DO NOT MERGE Sanitize WifiConfigs 
* commit 'e1d4847c120f4ab72b3acfed17c0015bdb2befaf':
  DO NOT MERGE Sanitize WifiConfigs
 2014-04-07 20:46:58 +00:00
Robert Greenwalt
00790e4f21 am c855a28a: am e630a073: am 4342c3d6: (-s ours) am 8f2cf6a9: am 39e9ece0: am b3efa6a3: (-s ours) am 106627e0: am e42ce676: am ebf23a8d: am 8a1be0be: am 3c417fbf: Merge "DO NOT MERGE Sanitize WifiConfigs" into jb-mr1-dev 
* commit 'c855a28a51ea10fcfb4dd20dcdbe26b6e08fe9d9':
  DO NOT MERGE Sanitize WifiConfigs
 2014-04-07 20:37:38 +00:00
Robert Greenwalt
eddae63ab2 am 9932c297: (-s ours) am f9e24b30: am b0f4f4d7: am 2cc9ee1c: (-s ours) am 2c90609c: am 339cfdbd: am 72f9b308: am 7d574493: am 1600a26e: am 7f6d1ef7: am 8eac056f: DO NOT MERGE Sanitize WifiConfigs 
* commit '9932c29766d5cea833f2b4cab2f72c782cead0b2':
  DO NOT MERGE Sanitize WifiConfigs
 2014-04-07 20:34:49 +00:00
Robert Greenwalt
9932c29766 am f9e24b30: am b0f4f4d7: am 2cc9ee1c: (-s ours) am 2c90609c: am 339cfdbd: am 72f9b308: am 7d574493: am 1600a26e: am 7f6d1ef7: am 8eac056f: DO NOT MERGE Sanitize WifiConfigs 
* commit 'f9e24b3065a0001ce826a101ce73eacac1aad743':
  DO NOT MERGE Sanitize WifiConfigs
 2014-04-07 20:27:50 +00:00
Robert Greenwalt
e630a07387 am 4342c3d6: (-s ours) am 8f2cf6a9: am 39e9ece0: am b3efa6a3: (-s ours) am 106627e0: am e42ce676: am ebf23a8d: am 8a1be0be: am 3c417fbf: Merge "DO NOT MERGE Sanitize WifiConfigs" into jb-mr1-dev 
* commit '4342c3d6b2f745aec10c213a2107b877cf464f94':
  DO NOT MERGE Sanitize WifiConfigs
 2014-04-07 20:26:35 +00:00
Robert Greenwalt
f9e24b3065 am b0f4f4d7: am 2cc9ee1c: (-s ours) am 2c90609c: am 339cfdbd: am 72f9b308: am 7d574493: am 1600a26e: am 7f6d1ef7: am 8eac056f: DO NOT MERGE Sanitize WifiConfigs 
* commit 'b0f4f4d76ac299bf313500288d26f07979e8c77e':
  DO NOT MERGE Sanitize WifiConfigs
 2014-04-07 20:21:52 +00:00
Robert Greenwalt
4342c3d6b2 am 8f2cf6a9: am 39e9ece0: am b3efa6a3: (-s ours) am 106627e0: am e42ce676: am ebf23a8d: am 8a1be0be: am 3c417fbf: Merge "DO NOT MERGE Sanitize WifiConfigs" into jb-mr1-dev 
* commit '8f2cf6a980e629080e5ea196c1e7a07754abb3cf':
  DO NOT MERGE Sanitize WifiConfigs
 2014-04-07 20:18:41 +00:00
Robert Greenwalt
b0f4f4d76a am 2cc9ee1c: (-s ours) am 2c90609c: am 339cfdbd: am 72f9b308: am 7d574493: am 1600a26e: am 7f6d1ef7: am 8eac056f: DO NOT MERGE Sanitize WifiConfigs 
* commit '2cc9ee1c6fd302ef34045f8f2c8f812222ce7807':
  DO NOT MERGE Sanitize WifiConfigs
 2014-04-07 20:16:15 +00:00
Robert Greenwalt
8f2cf6a980 am 39e9ece0: am b3efa6a3: (-s ours) am 106627e0: am e42ce676: am ebf23a8d: am 8a1be0be: am 3c417fbf: Merge "DO NOT MERGE Sanitize WifiConfigs" into jb-mr1-dev 
* commit '39e9ece04502e57f30e6814a01e6673d2a4216a5':
  DO NOT MERGE Sanitize WifiConfigs
 2014-04-07 20:12:56 +00:00
Robert Greenwalt
2cc9ee1c6f am 2c90609c: am 339cfdbd: am 72f9b308: am 7d574493: am 1600a26e: am 7f6d1ef7: am 8eac056f: DO NOT MERGE Sanitize WifiConfigs 
* commit '2c90609c0bddb6fbe255e5632a1e6639e760290f':
  DO NOT MERGE Sanitize WifiConfigs
 2014-04-07 20:09:33 +00:00
Robert Greenwalt
39e9ece045 am b3efa6a3: (-s ours) am 106627e0: am e42ce676: am ebf23a8d: am 8a1be0be: am 3c417fbf: Merge "DO NOT MERGE Sanitize WifiConfigs" into jb-mr1-dev 
* commit 'b3efa6a38bbc5109db605ec62ebffa820ba402ce':
  DO NOT MERGE Sanitize WifiConfigs
 2014-04-07 20:07:10 +00:00
Robert Greenwalt
b3efa6a38b am 106627e0: am e42ce676: am ebf23a8d: am 8a1be0be: am 3c417fbf: Merge "DO NOT MERGE Sanitize WifiConfigs" into jb-mr1-dev 
* commit '106627e07cecfa8a9bcc43578fde78652fc59eba':
  DO NOT MERGE Sanitize WifiConfigs
 2014-04-07 20:00:33 +00:00
Robert Greenwalt
7d57449337 am 1600a26e: am 7f6d1ef7: am 8eac056f: DO NOT MERGE Sanitize WifiConfigs 
* commit '1600a26e64e8ade9a67418ca1792c6100a99d15f':
  DO NOT MERGE Sanitize WifiConfigs
 2014-04-07 19:47:49 +00:00
Robert Greenwalt
1600a26e64 am 7f6d1ef7: am 8eac056f: DO NOT MERGE Sanitize WifiConfigs 
* commit '7f6d1ef7d85327c80f9539cc17895fe61cba2016':
  DO NOT MERGE Sanitize WifiConfigs
 2014-04-07 19:42:49 +00:00
Robert Greenwalt
7f6d1ef7d8 am 8eac056f: DO NOT MERGE Sanitize WifiConfigs 
* commit '8eac056f75f09ecdbc2fe550b6e05c8d6fd30398':
  DO NOT MERGE Sanitize WifiConfigs
 2014-04-07 19:36:54 +00:00
Robert Greenwalt
8a1be0be1f am 3c417fbf: Merge "DO NOT MERGE Sanitize WifiConfigs" into jb-mr1-dev 
* commit '3c417fbf21133340cbbe3539d87c453f81ae3a9d':
  DO NOT MERGE Sanitize WifiConfigs
 2014-04-07 19:36:44 +00:00
The Android Automerger
1c6abef365 merge in master-release history after reset to master 2014-04-07 05:49:39 -07:00
Jaewan Kim
6964e76e2d Merge "Revert "Refactor IpConfiguration from WifiConfiguration"" 2014-04-07 09:01:43 +00:00
Jaewan Kim
273c161b68 Revert "Refactor IpConfiguration from WifiConfiguration" 
This reverts commit e51d2c5ade.

Change-Id: Ibccea84e5dc44c1b8954779660e0721b27f762d4
 2014-04-07 09:01:24 +00:00
Jaewan Kim
6a9403215a Revert "Hide IpConfiguration" 
This reverts commit 3b81925ae8.

Change-Id: I5728114dbd9ef37509e8ab3c942648ec92ef0c1a
 2014-04-07 08:54:45 +00:00
Jaewan Kim
3b81925ae8 Hide IpConfiguration 
Bug: 7606609, Bug: 8687763
Change-Id: I2970bf79ef14cb993878c1dc10c7022a716f46c5
 2014-04-07 17:11:39 +09:00
Jaewan Kim
e51d2c5ade Refactor IpConfiguration from WifiConfiguration 
Bug: 7606609, Bug: 8687763
Change-Id: I736eb3c73a8ffc8f137a04a5ea66ee564dc2b530
 2014-04-07 11:35:35 +09:00