tree 2c3a27bd6a43f048a5f3474896e8b7a0a113474b
parent 52429b4a8b9be501f52df62e77c3e4bbb5bf0c3f
parent b9884663124b609a5cb093fc4a8a8a3b9a8d308d
author Lorenzo Colitti <lorenzo@google.com> 1441757919 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1441757919 +0000

Merge changes from topic 'packet-keepalive-fixes' into mnc-dr-dev

* 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.