Glen Kuhne 3935ae9967 Move ipconnectivity.proto to services-proto.jar ...

Moved ipconnectivity.proto from services.core.jar to
framework-protos.jar.
Replaced 'mergeFrom' MessageNano base class calls, with 'parseFrom'
IpConnectivityLog calls.

This solves an issue where the services.jar would conflict with
duplicate nano proto base class definitions in other .jars
(wifi-service.jar).

Bug: 32261442
Test: Existing unit tests pass
Change-Id: I49100935fcae2e85e12eaa7f3462864f3a340b97

2016-10-26 10:18:46 -07:00

..

core/java/com/android/server

Merge "Add unit tests for Tethering.isTetherProvisioningRequired" am: 836ffa6e1c am: 4942a15e19 am: 1e0ea3cc22

2016-10-25 18:43:16 +00:00

net/java/android/net

Refactor "avoid bad wifi" logic into a utility class

2016-10-04 15:07:42 +09:00

tests/servicestests

Move ipconnectivity.proto to services-proto.jar

2016-10-26 10:18:46 -07:00