OSDN Git Service

Merge "Lock down networking when waiting for always-on" into nyc-dev
authorRobin Lee <rgl@google.com>
Wed, 18 May 2016 23:37:23 +0000 (23:37 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 18 May 2016 23:37:24 +0000 (23:37 +0000)
commitd171df660e19bdba4d188beeb8b6023874712413
tree807ff3e97f77a0420fa63aa0a2d38778c34eb7f1
parentec82d3e76e36b4e15835e7b48dff6aa7a861153e
parent17e6183b85ba3038acb935aaa01415058b2e6ddd
Merge "Lock down networking when waiting for always-on" into nyc-dev
core/java/android/provider/Settings.java
services/core/java/com/android/server/ConnectivityService.java
services/core/java/com/android/server/NetworkManagementService.java