OSDN Git Service

Merge "[AWARE] Add UID checking to WifiAwareNetworkSpecifier" am: 2fd19ffa06 am:...
authorEtan Cohen <etancohen@google.com>
Tue, 25 Apr 2017 13:40:42 +0000 (13:40 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 25 Apr 2017 13:40:42 +0000 (13:40 +0000)
commit79d9e99632923994aa026db15f5f29af1af24db4
tree3568b17c6863b7bec36680a9c2af7101ee428c26
parente45651ba8f6a472ec54b8a9771aca137e1dd4a05
parent887fd907422033b8a0192b9118195e61d1fcefea
Merge "[AWARE] Add UID checking to WifiAwareNetworkSpecifier" am: 2fd19ffa06 am: 3c6305cc55
am: 887fd90742

Change-Id: I8480ac43d89dc85b541e6255c3cdc597393896cf
services/core/java/com/android/server/ConnectivityService.java
tests/net/java/com/android/server/ConnectivityServiceTest.java
wifi/java/android/net/wifi/aware/WifiAwareManager.java