OSDN Git Service

Fix NOT_RESTRICTED network capability and enforce it.
authorPaul Jensen <pauljensen@google.com>
Fri, 28 Aug 2015 15:58:50 +0000 (11:58 -0400)
committerPaul Jensen <pauljensen@google.com>
Fri, 28 Aug 2015 16:48:11 +0000 (12:48 -0400)
commita12044215b1148826ea9a88d5d1102378b13922f
tree99b57c6f198d9b13411d024c40886fa0aed38b08
parent50af68e74a756d0fc81eda2a3580dbcf70362d42
Fix NOT_RESTRICTED network capability and enforce it.

With this change:
1. NOT_RESTRICTED should be removed from NetworkRequests that bring up
   special restricted carrier networks (e.g. IMS, FOTA).
2. NetworkRequests without NOT_RESTRICTED require CONNECTIVITY_INTERNAL
   permission to register
3. Binding sockets to networks without NOT_RESTRICTED requires
   CONNECTIVITY_INTERNAL permission

Bug:21637535
Change-Id: I5991d39facaa6b690e969fe15dcbeec52e918321
(cherry picked from commit 487ffe7d3d84bf65212158f7098e8a84b5b55e09)
core/java/android/net/ConnectivityManager.java
core/java/android/net/NetworkCapabilities.java
core/java/android/net/NetworkRequest.java
core/java/android/os/INetworkManagementService.aidl
services/core/java/com/android/server/ConnectivityService.java
services/core/java/com/android/server/NetworkManagementService.java