Commit graph

3,567 commits

Message SHA1
Merge "Add test coverage for NetworkSpecifiers." am: dfc4442b38 am: 7e3a5daee4
am: 8ee38521bc

Change-Id: Ia7d36096f0e3f0b203d1d838043c03fcd1cea829

Lorenzo Colitti   authored and   android-build-merger   commited 2017-04-03 10:59:17 +00:00
b255aa1bb3
Merge "Add test coverage for NetworkSpecifiers."
am: dfc4442b38

Change-Id: Ia328b945af4c4f55ef560b33b00fa861b8f81b0d

Lorenzo Colitti   authored and   android-build-merger   commited 2017-04-03 10:45:22 +00:00
7e3a5daee4
Merge "Add test coverage for NetworkSpecifiers."
Treehugger Robot   authored and   Gerrit Code Review   commited 2017-04-03 10:37:01 +00:00
dfc4442b38
Merge "ConnectivityService: simplify WakeLock management" am: 82d6ba7331 am: 36113ed38c
am: 56ca1705d6

Change-Id: Iacc2e977c1eec2ebc9deb9395e1f77a62b57f070

Hugo Benichi   authored and   android-build-merger   commited 2017-04-03 09:17:18 +00:00
21f3caf409
Merge "ConnectivityService: simplify WakeLock management"
am: 82d6ba7331

Change-Id: I1e0ae930cd7a329febf21ff3fc83ad2d0a3be69b

Hugo Benichi   authored and   android-build-merger   commited 2017-04-03 09:03:13 +00:00
36113ed38c
Merge "ConnectivityService: simplify WakeLock management"
Hugo Benichi   authored and   Gerrit Code Review   commited 2017-04-03 08:56:24 +00:00
82d6ba7331
Add test coverage for NetworkSpecifiers.
Tests various combinations of empty / non-empty NetworkSpecifiers
and changing specifiers on the fly.

Test: ConnectivityServiceTest passes
Bug: 27533960
Change-Id: Ibd6b4efc861dc51689e46f3882ba859223411bf0

Lorenzo Colitti   commited 2017-04-03 17:46:35 +09:00
5b72d6d850
Consistent dump() permission checking.
am: 5815e5b538

Change-Id: I300f8bc07e1266b9e78f56d085cd458862176a85

Jeff Sharkey   authored and   android-build-merger   commited 2017-04-03 06:19:02 +00:00
ed1dff0016
Consistent dump() permission checking.
This change introduces new methods on DumpUtils that can check if the
caller has DUMP and/or PACKAGE_USAGE_STATS access.  It then moves all
existing dump() methods to use these checks so that we emit
consistent error messages.

Test: cts-tradefed run commandAndExit cts-dev -m CtsSecurityTestCases -t android.security.cts.ServicePermissionsTest
Bug: 32806790
Change-Id: Iaff6b9506818ee082b1e169c89ebe1001b3bfeca

Jeff Sharkey   commited 2017-04-02 22:29:07 -06:00
5815e5b538
Merge "ConnectivityService: log wakelock activity in dumps" am: 2dbfd3fe41 am: 7b0e9d0263
am: bf1b181c63

Change-Id: Id4c980a2a1ef7f51b6a06c7c8636160437e99b84

Hugo Benichi   authored and   android-build-merger   commited 2017-04-03 00:00:19 +00:00
27e6058e54
ConnectivityService: simplify WakeLock management
This patch simplifies wakelock management by acknowledging that only one
acquisition at most is in flight at any time. This allows to remove the
serial number associated with wakelock acquisition and to avoid double
release when regaining a default network.

Example of $ adb shell dumpsys connectivity logs:
  NetTransition WakeLock activity (most recent first):
    03-31 00:15:13.816 - RELEASE (EVENT_CLEAR_NET_TRANSITION_WAKELOCK)
    03-31 00:14:59.216 - ACQUIRE for NetworkAgentInfo [WIFI () - 101]
    03-31 00:09:05.799 - RELEASE (EVENT_EXPIRE_NET_TRANSITION_WAKELOCK)
    03-31 00:08:05.738 - ACQUIRE for NetworkAgentInfo [WIFI () - 100]

Test: watched wakelock section $ adb shell dumpsys connectivity while
      turning on and off Wifi (with no other network).
Bug: 36703718
Change-Id: I899b0816c0e41b3991d9540e9b9a604914ff673a

Hugo Benichi   commited 2017-04-03 08:54:54 +09:00
58aab55bdf
Merge "ConnectivityService: log wakelock activity in dumps"
am: 2dbfd3fe41

Change-Id: If08e0088ab25f1494aaf3a339a38e7a8e343d910

Hugo Benichi   authored and   android-build-merger   commited 2017-04-02 23:47:15 +00:00
7b0e9d0263
Merge "ConnectivityService: log wakelock activity in dumps"
Hugo Benichi   authored and   Gerrit Code Review   commited 2017-04-02 23:40:27 +00:00
2dbfd3fe41
Merge "move network notification IDs to central registry" into oc-dev
am: fb54aee325

Change-Id: I0abcea4b9fe43e5c08885413e0f9a419b87b7206

Chris Wren   authored and   android-build-merger   commited 2017-04-01 16:23:25 +00:00
24b85a07e9
move network notification IDs to central registry
Bug: 36808999
Test: make
Change-Id: I34bafa9ce69fc6913a6b4a5935cafd8979d0193b

Chris Wren   commited 2017-03-31 14:02:23 -04:00
b56dc53847
ConnectivityService: log wakelock activity in dumps
This patch adds wakelock acquire and release activity to
ConnectivityService logs in dumpsys. All of the last 20 acquire and
release operations are logged.

This patch also:
  - does a bit of cleanup to related dumpsys logs
  - unify pretty printing of internal event ids to their names.
  - delete mInetLog which was obsolete and not used.

Example of logs:
  NetTransition WakeLock activity (most recent first):
    03-30 02:15:40.628 - RELEASE 1 by EVENT_EXPIRE_NET_TRANSITION_WAKELOCK: not released (serial number was 2)
    03-30 02:15:09.965 - ACQUIRE 2 for NetworkAgentInfo [WIFI () - 101]
    03-30 02:15:01.877 - RELEASE 1 by EVENT_CLEAR_NET_TRANSITION_WAKELOCK: released
    03-30 02:14:40.598 - ACQUIRE 1 for NetworkAgentInfo [WIFI () - 100]

Test: inspected result of $ adb shell dumpsys connectivity
Bug: 36703718
Change-Id: Ia8e2016fc512ee798ef0adc3f612d1f6c33d4870

Hugo Benichi   commited 2017-03-31 08:59:59 +09:00
23ec1c9338
resolve merge conflicts of 943187668c44 to oc-dev-plus-aosp
Test: make -j30
Test: runtest -x tests/net/java/com/android/server/ConnectivityServiceTest.java
Test: runtest -x tests/net/java/com/android/server/connectivity/VpnTest.java
Change-Id: Ib87cdb96626cd7625e15bec5e4afab12920405e9

Robin Lee   commited 2017-03-30 17:39:56 +01:00
a2e8ad5dbb
Merge "Move some VPN logic out of ConnectivityService"
am: 0ce38796bd

Change-Id: I212c2d6de1676ab65e6bbf34148d66e183d60c62

Robin Lee   authored and   android-build-merger   commited 2017-03-30 16:08:50 +00:00
017e2bf3f8
Merge "Move some VPN logic out of ConnectivityService"
Robin Lee   authored and   Gerrit Code Review   commited 2017-03-30 16:00:41 +00:00
0ce38796bd
resolve merge conflicts of 6c3cd4449517 to oc-dev-plus-aosp
Test: make -j64 framework services FrameworksNetTests
Change-Id: Ib828e56b271cd983ef325e366418ca8db9774628

Lorenzo Colitti   commited 2017-03-28 23:49:11 +09:00
725386186f
Merge changes If94102c7,I8d51e8e0
am: 22b829c049

Change-Id: I8aa529a05fc40241ec9664775ca0ebd8960098a8

Lorenzo Colitti   authored and   android-build-merger   commited 2017-03-28 12:33:28 +00:00
73d1aa0bdd
Make ConnectivityServiceTest pass on wifi-only devices.
Test: ConnectivityServiceTest passes on ryu on internal master
Test: ConnectivityServiceTest passes on bullhead
Change-Id: If94102c7df0257ea9e69e72b07a685ae3c2c4022

Lorenzo Colitti   commited 2017-03-28 12:53:06 +09:00
756a02232b
Restore the net.dnsX system properties.
In order to avoid app breakage, we are putting back the system
properties and using selinux to disallow access from apps
targeting the O SDK or above.

This CL is cherry-picked from internal commit
aefac392ea, but with a different
commit description.

Bug: 33308258
Bug: 33807046
Bug: 34028616
Bug: 34115651
Test: system properties are readable as root and shell
Change-Id: I8d51e8e0a620d581c4251fb2f3c1d0a813b929be

Lorenzo Colitti   commited 2017-03-28 06:55:01 +09:00
e7f4a225b4
Move some VPN logic out of ConnectivityService
This cleanup helps declutter ConnectivityService, and encapsulates the
always-on setting inside of Vpn instead of spreading it across two
classes.

In particular having the save code in one file and the load code in
another file was weird and I apologise for that.

Added a SystemServices wrapper for Settings.Secure and PendingIntent
calls to decouple some of the global state nastiness and make it
testable without forcing ConnectivityService to drive the load/save.

Test: runtest -x tests/net/java/com/android/server/ConnectivityServiceTest.java
Test: runtest -x tests/net/java/com/android/server/connectivity/VpnTest.java
Bug: 33159037
Change-Id: Ie2adb1c377adfcef0a5900dc866e6118f451b265

Robin Lee   commited 2017-03-27 13:40:51 +01:00
fe0bb6b248
Merge "Fix NetworkNotificationManagerTest"
TreeHugger Robot   authored and   Android (Google) Code Review   commited 2017-03-23 06:25:38 +00:00
5da64fe275
Fix NetworkNotificationManagerTest
The testNotificationsShownAndCleared test was not doing anything
because the list of notification to show was always empty.

This patch fixes this issue and actually makes the test loop on
non-empty collections, and also fixes another ordering issue in
assertions themselves, hidden until now by the first issue.

Test: runtest -x frameworks/base/tests/net/java/com/android/server/connectivity/NetworkNotificationManagerTest.java
Change-Id: I4837b1175d7c9133e9156e33acaa1e7e3341cc62

Hugo Benichi   commited 2017-03-23 12:32:27 +09:00
913556e68e
Merge "Connectivity metrics: add transports to validation probes"
TreeHugger Robot   authored and   Android (Google) Code Review   commited 2017-03-21 04:22:40 +00:00
186373109a
Merge changes I8bfabcb1,I563a6a31
* changes:
  Connectivity metrics: change how interface names are logged
  Connectivity metrics: serialize networkId, transports, ifname

TreeHugger Robot   authored and   Android (Google) Code Review   commited 2017-03-21 02:59:20 +00:00
6f774a42eb
Connectivity metrics: add transports to validation probes
This patch adds transports info to ValidationProbeEvent and migrates
netId logging for this event to the topt-level netId field in
ConnectivityMetricsEvent.

Test: modified unit tests. $ runtest frameworks-net passes
Bug: 3490169
Change-Id: Ibf51049ba8901ae5ca4ea86e2f500944a4738b5c

Hugo Benichi   commited 2017-03-21 11:43:18 +09:00
f5c09ce0e6
Connectivity metrics: change how interface names are logged
This patch deprecates the ifname field for specific metrics events of
types DhcpClientEvent, DhcpErrorEvent, IpReachabilityEvent and
IpManagerEvent.

Instead ifnames are logged in ConnectivityMetricsEvent, allowing for
link layer inference.

Test: updated unit tests, $ runtest frameworks-net passes
Bug: 34901696
Change-Id: I8bfabcb115bbd5289471d653c153a40bb48f28cd

Hugo Benichi   commited 2017-03-21 10:18:56 +09:00
d03ff4e363
Connectivity metrics: serialize networkId, transports, ifname
This patch adds translation from ConnectivityMetricsEvent to
IpConnectivityEvent of recently added fields:
 - top-level network id
 - top-level ifname
 - transports

Also adds inference of link layer from transports or ifname.

At the moment these new fields are not populated in
ConnectivityMetricsEvent. Follow-up patches will fill this gap for
the events of the android.net.metrics package.

Test: new unit tests, $ runtest frameworks-net passes
Bug: 34901696
Change-Id: I563a6a3183470bdfaabb7c781a1beaf6b1058bf0

Hugo Benichi   commited 2017-03-21 10:18:11 +09:00
9ee5e7a0a0
Merge "In isTetheringSupported, call isAdmin user from system." am: 4a8953094f am: cbb748ead3
am: 0b8756e735

Change-Id: I76d02e97382c0332e3d93383d60e8e7fc9951a08

Jeremy Klein   authored and   android-build-merger   commited 2017-03-21 00:10:46 +00:00
946349711d
Merge "In isTetheringSupported, call isAdmin user from system."
am: 4a8953094f

Change-Id: Ibefe655ed377c55322d871e02d87c0d001327da8

Jeremy Klein   authored and   android-build-merger   commited 2017-03-20 23:58:09 +00:00
cbb748ead3
In isTetheringSupported, call isAdmin user from system.
This avoids requiring the MANAGE_USERS permission in this function.

Bug: 32671528
Test: Manual. Also seeking unit test guidance from reviewer.
Change-Id: I841e721013b0e4b6db34d629a1e97b3cd54cd73b

Jeremy Klein   commited 2017-03-20 15:02:30 -07:00
a380d3f60b
Merge "ConnectivityMetricsEvent: add ifname, netid, transports"
TreeHugger Robot   authored and   Android (Google) Code Review   commited 2017-03-16 02:50:23 +00:00
f6b939b076
ConnectivityMetricsEvent: add ifname, netid, transports
This patch adds new fields to ConnectivityMetricsEvent to make it more
symmetric to IpConnectivityEvent in ipconnectivity.proto.

Follow-up patches will start populating these fields for users of
IpConnectivityLog.

Test: unit tests updated, $ runtest frameworks-net passes
Bug: 34901696
Change-Id: I396767cdfcf38cce893c0d6e1f4524f12e3fdc64

Hugo Benichi   commited 2017-03-16 09:58:02 +09:00
4781b3c93c
Merge "Connectivity metrics: simplify ConnectivityMetricsEvent"
Hugo Benichi   authored and   Android (Google) Code Review   commited 2017-03-16 00:37:47 +00:00
8e4bbe7aca
Connectivity metrics: simplify ConnectivityMetricsEvent
Now that ConnectivityMetricsEvent is only used for core networking
metrics and is not @SystemApi anymore, remove unused fields and prepare
for additional new fields.

Test: updated unit tests, $ runtest frameworks-net passes
Bug: 34901696
Change-Id: I15abad19981d491f16f2a3afe401f1e833079907

Hugo Benichi   commited 2017-03-15 15:12:38 +09:00
f7e50b1b8f
Merge "IP connectivity metrics: add new APF counters."
TreeHugger Robot   authored and   Android (Google) Code Review   commited 2017-03-15 04:24:30 +00:00
3807fecc94
IP connectivity metrics: add new APF counters.
This patch adds a few missing counters to APF events:
 - an actual lifetime duration to ApfProgramEvent.
 - counters for total number of updates to ApfStatistics.

ApfProgramEvents are now recorded at program removal in order to
populate the actual lifetime of the program. ApfProgramEvents whose
actual lifetime was less than 1 second are filtered out.

Finally, instance fields of ApfProgramEvent and ApfStats classes are
made mutable to allow for simple record-like creation. This was not
possible when these classes were tagged @SystemApi.

Test: - manually verified output of $ dumpsys connmetrics list
      - unit tests updated.
Bug: 34901696

Change-Id: I02694ebb9421ce1c2aa757fa6aa209d19a654dcd

Hugo Benichi   commited 2017-03-15 11:49:48 +09:00
5865a0f0d8
Merge "ConnectivityManager: unhide methods with Handler argument" am: 45a54e122b am: 08fda7ecb3
am: 1673f71afb

Change-Id: Ic575f187803548ce15965d6fde942a5322d9e35e

Hugo Benichi   authored and   android-build-merger   commited 2017-03-13 07:18:54 +00:00
f8c2041da1
Merge "ConnectivityManager: unhide methods with Handler argument"
am: 45a54e122b

Change-Id: I470d68a25e62b9493ac7cfb5887e8345968f1097

Hugo Benichi   authored and   android-build-merger   commited 2017-03-13 07:09:49 +00:00
08fda7ecb3
Merge "ConnectivityManager: unhide methods with Handler argument"
Hugo Benichi   authored and   Gerrit Code Review   commited 2017-03-13 06:58:30 +00:00
45a54e122b
Merge "IP connectivity metrics: ConnectStats additions"
TreeHugger Robot   authored and   Android (Google) Code Review   commited 2017-03-13 03:02:01 +00:00
9603d2a9e7
IP connectivity metrics: ConnectStats additions
This patch:
  - adds a counter to ConnectStats for counting the number of successful
    connect() calls done in blocking mode. This allows to compute error
    rates for connect() in blocking mode.
  - add printing of ConnectStats when dumping NetdEventListenerService
    and/or IpConnectivityMetrics service.

Test: $ runtest frameworks-net, + manual tests verifying logged events.
Bug: 34901696
Change-Id: I889e8ccd12681b0511be487e9d2ee44290a2d7d7

Hugo Benichi   commited 2017-03-13 09:25:15 +09:00
3ce639664a
Merge "Simple cleanups to Tethering" am: 7eaa2ad172 am: a24e00242d
am: bc559bad9d

Change-Id: I393817fac7402d51fbd8dfd1fda20d16b398de17

Hugo Benichi   authored and   android-build-merger   commited 2017-03-13 00:23:32 +00:00
269acc4c51
Merge "Simple cleanups to Tethering"
am: 7eaa2ad172

Change-Id: I3bb7e4756eaa0b7e702ff7270beb7420b7b6aac5

Hugo Benichi   authored and   android-build-merger   commited 2017-03-13 00:14:55 +00:00
a24e00242d
Simple cleanups to Tethering
- regroup together static final class fields, final instance fields, and
  mutable instance fields.
- uses correct Android naming conventions for instance fields.
- reorder imports correctly.

Test: no functional change.
Change-Id: If3d73bc28972a004c2ba3cc14d869a2a679abfce

Hugo Benichi   commited 2017-03-10 15:32:30 +09:00
c0b3f6eaeb
ConnectivityManager: unhide methods with Handler argument
Test: no functionality change
Bug: 32130437
Change-Id: I2a57175142683f991a215b584282db143a76ed9d

Hugo Benichi   commited 2017-03-09 15:25:26 +09:00
a57b30c6b2
IP connectivity metrics: update ipconnectivity.proto
This patch adds several new fields to ipconnectivity.proto for
improving APF metrics, connect metrics, and link_layer inference.

Test: build, flashed, ran $ adb shell dumpsys connmetrics list proto
      updated metrics unit tests depending on proto schema
Bug: 34901696
Change-Id: I6f68e16f583a6b407f33f8a500133e100f3453c7

Hugo Benichi   commited 2017-03-09 15:19:02 +09:00
b266fa2cdb