Commit Graph

2580 Commits

Author SHA1 Message Date
Jeremy Klein
407e2a51e0 Merge "Add a null check for the OnStartTetheringCallback." 2016-03-23 18:52:16 +00:00
Pierre Imai
475811222a Merge "Improve NetworkCapabilities command chaining." into nyc-dev am: 9b71d66
am: 8704426

* commit '87044260bed79cd191c21081b2394271797d902f':
  Improve NetworkCapabilities command chaining.
2016-03-23 01:22:19 +00:00
Pierre Imai
9b71d6659d Merge "Improve NetworkCapabilities command chaining." into nyc-dev 2016-03-23 01:11:15 +00:00
Paul Stewart
3dee52489b Merge changes Iddeebeb8,Idd1e37a3 into nyc-dev am: e611bda
am: 366f851

* commit '366f851e35019816f278de6307c5aec87bbe569f':
  WifiManager: Use ConnectivityThread
  Create ConnectivityThread
2016-03-22 22:31:06 +00:00
Paul Stewart
e611bda1e2 Merge changes Iddeebeb8,Idd1e37a3 into nyc-dev
* changes:
  WifiManager: Use ConnectivityThread
  Create ConnectivityThread
2016-03-22 22:23:48 +00:00
Pierre Imai
aabd22dad9 Improve NetworkCapabilities command chaining.
setNetworkSpecifier() now returns this.
BUG: 26797290

Change-Id: Ia8bd0836d9ac715408eca102bf4a2d23f044fa72
2016-03-22 22:29:22 +09:00
Erik Kline
8ac4ad8df5 Merge "Support registering a request for the default network" into nyc-dev am: d36ba73
am: e96834c

* commit 'e96834c583f99fb31bb9c80bddc8a73387fed028':
  Support registering a request for the default network
2016-03-22 07:33:25 +00:00
Erik Kline
23bf99c956 Support registering a request for the default network
Change-Id: I079f5be97b585cf5692dd4c7a144b993d168a9a5
2016-03-22 15:44:16 +09:00
Lorenzo Colitti
768bd2c12e Merge "Remove framework code that calls SIOCKILLADDR" into nyc-dev am: e6109dd
am: 7ceb8f5

* commit '7ceb8f53825c1220647f3282da62ada393e8b6a5':
  Remove framework code that calls SIOCKILLADDR
2016-03-22 05:47:06 +00:00
Lorenzo Colitti
d8332d1a1b Remove framework code that calls SIOCKILLADDR
Bug: 26976388
Change-Id: I652361d9e650a77085070d6c26b28b7638ba2dfe
2016-03-22 12:54:32 +09:00
Paul Stewart
1f6a458995 Create ConnectivityThread
Create a common singleton thread to be shared among all
connectivity tasks.  Instead of launching separate threads to
handle downstream messages from the various service instances used
in connectivity, these managers can choose to share this instance.

Bug: 27695292

Change-Id: Idd1e37a3e793c5485091509c3d7351e4d29288f0
2016-03-19 10:05:06 -07:00
Lorenzo Colitti
c2f99d7910 Merge changes Idf0cfee8,I27307e2e into nyc-dev am: 7d0e392
am: e77e70d

* commit 'e77e70d00f3da6dd856f2d641d46080fbebacd0a':
  Use native netd binder interface in NetworkManagementService.
  Fix IdleableHandlerThread.
2016-03-17 19:09:06 +00:00
Lorenzo Colitti
6114f2bbb1 Fix IdleableHandlerThread.
Occasionally, ConnectivityServiceTest fails with "BUG: only one
idle handler allowed". I have not been able to reproduce this
consistently, but code inspection reveals an unsafe access to
mIdleHandler inside queueIdle. Wrap that in a synchronized block.

Change-Id: I27307e2e55fa8d937d7f043bd436894091c3c667
2016-03-17 10:52:57 +09:00
Lorenzo Colitti
b520f1d12c Merge "APF: add debug code." into nyc-dev am: 6b7c9ec
am: ae57b47

* commit 'ae57b477436f1e89bb7c92533680cf445db67053':
  APF: add debug code.
2016-03-16 08:20:36 +00:00
Lorenzo Colitti
1e01f0872e APF: add debug code.
1. Store additional debug information when RA filtering.
2. Add a toString method for RA packets.
3. Make "adb shell dumpsys connectivity apf" dump APF filter
   state.

Bug: 26238573
Change-Id: I1441ff7bc90e63624f8b10a220b2ac97f4d390a5
2016-03-16 15:45:47 +09:00
Jeremy Klein
35e99ea8ef Add a null check for the OnStartTetheringCallback.
This avoids a NullPointerException when trying to call the callback
and gives a more readable error message.

Change-Id: Id0353ef541c76efcb4a9a12c082e1b6ec9389f02
2016-03-14 12:57:17 -07:00
Jeff Davidson
8b8d4014ab Merge "NetworkStats.Bucket API polish." into nyc-dev am: 6daa09a162
am: cb4ad1548e

* commit 'cb4ad1548ec10019760bbfd76268805809301fd6':
  NetworkStats.Bucket API polish.
2016-03-14 19:37:56 +00:00
Jeff Davidson
6daa09a162 Merge "NetworkStats.Bucket API polish." into nyc-dev 2016-03-14 19:30:23 +00:00
Jeff Davidson
43e43a99c9 NetworkStats.Bucket API polish.
-Add @IntDef constants for STATE_ and ROAMING_.
-Expand docs for ROAMING_ constants.
-Use ROAMING_NO/YES instead of ROAMING_DEFAULT/ROAMING.

Bug: 27531260
Change-Id: I54ecfb4148caa549214df0bee9983036ffa4cb55
2016-03-14 11:24:12 -07:00
Robin Lee
0bbd52a09c Merge "Skip lockdown setup if user is not up yet" into nyc-dev am: d646b3d67f
am: 2149ad57fd

* commit '2149ad57fda5b04a07a9ae7af723a358f7e29d2b':
  Skip lockdown setup if user is not up yet
2016-03-14 13:28:27 +00:00
Robin Lee
050d914677 Skip lockdown setup if user is not up yet
Sometimes USER_UNLOCKED can be sent before USER_STARTED. This puts
lockdown in a bad state as it needs a fully-functioning user to tie
itself to and listen for connectivity events.

Bug: 27637943
Change-Id: I41a784a75a8c8674cb61dbba10693dd56c9396dd
2016-03-14 13:19:14 +00:00
zhangshuxiao
ad8499f9cd When the applicantion is removed, reset network permission of this uid.
Probably not a portal: exception java.net.SocketException: Binding socket to network 102 failed: EPERM (Operation not permitted)

If there are SYSTEM permissions, then the original is SYSTEM permissions,
do not update. If other app of this uid have network permissions, the same
as before do not update, or update permissions. If all app of this uid
do not have any network permission to remove permissions.

Change-Id: I304d22b37de38d8b182639c0d7d7200adfcf715d
Signed-off-by: zhangshuxiao <zhangshuxiao@xiaomi.com>
2016-03-11 16:45:59 +08:00
Lorenzo Colitti
e74e501c37 DO NOT MERGE: Move PinningNetworkCallback out to a new NetworkPinner class. am: 502d7cd551 -s ours am: 96b3d0a1bb
am: fc79ffdbe6  -s ours

* commit 'fc79ffdbe641a470e364cf205616879cb87e3eb1':
  DO NOT MERGE: Move PinningNetworkCallback out to a new NetworkPinner class.
2016-03-07 22:30:32 +00:00
Lorenzo Colitti
96b3d0a1bb DO NOT MERGE: Move PinningNetworkCallback out to a new NetworkPinner class.
am: 502d7cd551  -s ours

* commit '502d7cd551e8a510f818bbe85a038c4e60913ef7':
  DO NOT MERGE: Move PinningNetworkCallback out to a new NetworkPinner class.
2016-03-07 22:19:32 +00:00
Lorenzo Colitti
502d7cd551 DO NOT MERGE: Move PinningNetworkCallback out to a new NetworkPinner class.
Cherry-picked from 4b0c762011

Bug: 19159232
Change-Id: Ic366b53259ee5944a8e864876425a6558c0a7216
2016-03-07 10:34:32 -08:00
Joe Onorato
f18010f994 Merge changes Ib6e0e6f3,I109f04c2,Idc716000,I44c51d5f,I810b9bd5, ... into nyc-dev am: 5d4ab988bd
am: 15e93f3715

* commit '15e93f3715742d0ffad6089cf804842f2e5f393b':
  Turn down the logging a little bit.
  Turn down the logging a little bit and don't do a log wrapper function.
  Turn down the logging a little bit.
  Turn down the logging a little bit.
  Turn down the logging a little bit.
  Turn down the logging a little bit.
  Turn down the logging a little bit.
2016-03-04 21:53:06 +00:00
Joe Onorato
8441f29d3a Turn down the logging a little bit.
Change-Id: Ib6e0e6f3577afac3b9bfe9a9b1cce70fb16d9d04
2016-03-04 12:21:30 -08:00
Paul Jensen
e3b37eaa84 Have ConnectivityService install packet filters when possible am: 9eca1f6072 am: 1d411461ef
am: 171160a352

* commit '171160a35286c12fb89058cd89d1bf93ff8943bf':
  Have ConnectivityService install packet filters when possible
2016-03-03 14:54:43 +00:00
Paul Jensen
1d411461ef Have ConnectivityService install packet filters when possible
am: 9eca1f6072

* commit '9eca1f607295b7138ac2113f77ae6018fe17f200':
  Have ConnectivityService install packet filters when possible
2016-03-03 14:48:45 +00:00
Lorenzo Colitti
dd29cf55ce Support 464xlat on Ethernet. am: 6a6903553b am: fbf7f85029
am: 9c129cccac

* commit '9c129cccac2a14ac2e4369e52134d2cb95e9da28':
  Support 464xlat on Ethernet.
2016-03-03 08:55:16 +00:00
Lorenzo Colitti
fbf7f85029 Support 464xlat on Ethernet.
am: 6a6903553b

* commit '6a6903553b196988d149d251652af9b73a2ddec2':
  Support 464xlat on Ethernet.
2016-03-03 08:39:16 +00:00
Paul Jensen
9eca1f6072 Have ConnectivityService install packet filters when possible
Listen for ICMP6 router advertisements on networks that support
packet filters.  Construct packet filters and install them to
ignore redundant future ICMP6 router advertisements.

Bug: 26238573
Change-Id: If78300b9fda257c21f3ee6533e1da7de9f897cb4
2016-03-03 17:32:01 +09:00
Lorenzo Colitti
6a6903553b Support 464xlat on Ethernet.
Bug: 26991160
Change-Id: I848c9e86e1ed337e95cfddda46723a9a1dcaed30
2016-03-03 17:31:57 +09:00
Lorenzo Colitti
68f220aabb Merge changes Id78aab9c,I51096b18 into nyc-dev am: 1856df512f
am: 057f24547a

* commit '057f24547afe0e2122863cab96b8149a43d3cf2d':
  Speed up ConnectivityServiceTest.
  Make it easier to test code that uses WakeupMessage.
2016-03-02 08:59:08 +00:00
Lorenzo Colitti
4c11582db3 Speed up ConnectivityServiceTest.
1. Override WakeupMessage with an implementation that uses
   sendEmptyMessageDelayed. This allows us to replace a
   6-second sleep with a 150ms wait.
2. Change waitFor()'s polling interval from 100ms to 50ms.

With these changes ConnectivityServiceTest goes from ~9s to ~3s.

Change-Id: Id78aab9cded90a5b17f09d7f437904e179808dd2
2016-03-02 17:01:50 +09:00
Lorenzo Colitti
a34b991bb3 Merge changes Ic366b532,I0179b45b into nyc-dev am: fd38423bd4
am: 6ad667122c

* commit '6ad667122c35098ab62afd92b5ac26937397825b':
  Move PinningNetworkCallback out to a new NetworkPinner class.
  Use MessageUtils in ConnectivityManager.
2016-03-02 07:04:56 +00:00
Jeff Sharkey
65ad544ca1 Merge "When system server goes down, crash apps more." into nyc-dev am: 60b7bcc614
am: 33a64f5e56

* commit '33a64f5e5600d86ef6ce270ce57fffbf4f2ab35d':
  When system server goes down, crash apps more.
2016-03-02 06:57:26 +00:00
Lorenzo Colitti
fd38423bd4 Merge changes Ic366b532,I0179b45b into nyc-dev
* changes:
  Move PinningNetworkCallback out to a new NetworkPinner class.
  Use MessageUtils in ConnectivityManager.
2016-03-02 04:18:03 +00:00
Lorenzo Colitti
4b0c762011 Move PinningNetworkCallback out to a new NetworkPinner class.
Also add tests.

Bug: 19159232
Change-Id: Ic366b53259ee5944a8e864876425a6558c0a7216
2016-03-02 12:50:35 +09:00
Jeff Sharkey
c78f85ca53 When system server goes down, crash apps more.
Apps making calls into the system server may end up persisting
internal state or making security decisions based on the perceived
success or failure of a call, or the default values returned.

The reality is that if the system process just died, init will be
along shortly to kill all running apps, so we should have no problem
rethrowing the RemoteException as a RuntimeException.

Bug: 27364859
Change-Id: Ife0bcb079636c88d54c44d17eb580409fd79028b
2016-03-01 19:29:16 -07:00
Robin Lee
0190497d11 Merge "ConnectivityService: listen to USER_UNLOCKED too" into nyc-dev am: 2f4286b792
am: fc46e9e4ca

* commit 'fc46e9e4caf6c0dfe0b6f905a06c2d2b132d8173':
  ConnectivityService: listen to USER_UNLOCKED too
2016-03-02 02:00:05 +00:00
Lorenzo Colitti
b027e6e92b Use MessageUtils in ConnectivityManager.
Change-Id: I0179b45bc54ffced8e5647d6f005b891b5de93ab
2016-03-01 22:57:29 +09:00
Robin Lee
829f7c72e5 ConnectivityService: listen to USER_UNLOCKED too
When the credential-encrypted private storage for the target user is
unlocked, we should try to start up VPN for them.

Bug: 27357283
Change-Id: Id9079230d00e3cea08a49ae66bd1f553416b4f54
2016-02-29 16:29:44 +00:00
Erik Kline
640723b521 Delete all NetworkUtils DHCP-related code. am: af0170a562 am: 866306752b
am: 80027c1f0b

* commit '80027c1f0b6a754b1a7cc5a6df918144cf979c78':
  Delete all NetworkUtils DHCP-related code.
2016-02-22 09:24:12 +00:00
Erik Kline
866306752b Delete all NetworkUtils DHCP-related code.
am: af0170a562

* commit 'af0170a562468acc53ef60f1d97c4dbd259b9af9':
  Delete all NetworkUtils DHCP-related code.
2016-02-22 09:16:16 +00:00
Erik Kline
af0170a562 Delete all NetworkUtils DHCP-related code.
Bug: 26991160
Change-Id: I2c74e0161f43f65c1b6a85dc9f294b64c8f1ae6e
2016-02-22 15:14:31 +09:00
Antonio Cansado
c2509f607b Merge "Implementation of data usage callbacks." into nyc-dev am: 12d7ea815b
am: 7e098af672

* commit '7e098af67280dbc877790486043998b13e83986e':
  Implementation of data usage callbacks.
2016-02-18 21:12:15 +00:00
Antonio Cansado
01cb4ff14d Implementation of data usage callbacks.
NetworkStatsService will register data usage requests
and keep data usage stats scoped to the request.

There are different types of data usage requests
- scoped to a set of NetworkTemplate; these are restrictred to
device owners and carrier apps and allow the caller to monitor
all activity on the specified interfaces.
- scoped to all uids visible to the user, if the user has
android.Manifest.permission#PACKAGE_USAGE_STATS permission.
The set of uids may change over time, so we keep track of that.
- scoped to a set of uids given by the caller, granted that
the caller has access to those uids.
- scoped to the caller's own data usage. This doesn't require
PACKAGE_USAGE_STATS.

Bug: 25812785
Change-Id: Ie11f35fc1f29d0dbe82f7fc924b169bb55c76708
2016-02-17 18:43:53 -08:00
Pierre Imai
e9ffe453a1 Merge "Silence the obnoxious MTU 0 error message that occur when no MTU is specified for a given network." 2016-02-12 01:51:23 +00:00
Erik Kline
2a813d23e8 Expose measurement results to interested callers.
am: 6ba9b90805

* commit '6ba9b90805d3e9a759a9b9a364b9ac406d9d573b':
  Expose measurement results to interested callers.
2016-02-10 15:58:17 +00:00