diff options
| author | Lorenzo Colitti <lorenzo@google.com> | 2015-09-09 01:04:38 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-09-09 01:04:38 +0000 |
| commit | 51c61ee23a55ccc75e0ddb3582720fc626607e42 (patch) | |
| tree | 90b19e44759aa54079f6396f1499b1b9477d68a7 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | bc303f4c216a67204894a99364909b47188e3297 (diff) | |
| parent | fd18370675f8794807747a18276dd7385e25f06e (diff) | |
am fd183706: am 22262f31: am 0bc35668: am 017223ac: Merge changes from topic \'packet-keepalive-fixes\' into mnc-dr-dev
* commit 'fd18370675f8794807747a18276dd7385e25f06e':
Require the new PACKET_KEEPALIVE_OFFLOAD permission.
Add an error code for generic hardware error.
Fix bugs and crashes in PacketKeepalive API.
Add tests for the PacketKeepalive API.
Add a PACKET_KEEPALIVE_OFFLOAD permission.
Use a CountDownLatch instead of sleep() in NetworkFactory tests.
Get rid of shortSleep() in ConnectivityServiceTest.
Make ConnectivityServiceTest a bit more readable.
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions