OSDN Git Service

am 017223ac: Merge changes from topic \'packet-keepalive-fixes\' into mnc-dr-dev
authorLorenzo Colitti <lorenzo@google.com>
Wed, 9 Sep 2015 00:26:59 +0000 (00:26 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 9 Sep 2015 00:26:59 +0000 (00:26 +0000)
commitfbb420cd606109dcbd898f891195b999f43f6b31
treea1ab67f53e2365fe7675a53e0e7252426ebe9060
parent66aa34f764546cd343df4b3953311017b6b60bce
parent017223acda5bfe16cb87d0a33d72dd28d2fccd3b
am 017223ac: Merge changes from topic \'packet-keepalive-fixes\' into mnc-dr-dev

* commit '017223acda5bfe16cb87d0a33d72dd28d2fccd3b':
  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.
services/core/java/com/android/server/ConnectivityService.java