OSDN Git Service

Merge changes from topic 'packet-keepalive-fixes' into mnc-dr-dev
authorLorenzo Colitti <lorenzo@google.com>
Wed, 9 Sep 2015 00:18:39 +0000 (00:18 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 9 Sep 2015 00:18:39 +0000 (00:18 +0000)
* changes:
  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.


Trivial merge