diff options
| author | Glen Kuhne <kuh@google.com> | 2016-10-25 15:47:25 -0700 |
|---|---|---|
| committer | Glen Kuhne <kuh@google.com> | 2016-10-26 10:18:46 -0700 |
| commit | 0719940ce4c877c3b627b276accba9ebcfdeeeef (patch) | |
| tree | 2671dc3160601e8ca97953a3b990d280dfbaca94 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | d80812b8823ee62932d5da24417112c471468b8c (diff) | |
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
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions