git.osdn.net Git - android-x86/frameworks-base.git/commit

author	Paul Jensen <pauljensen@google.com>
	Fri, 28 Aug 2015 15:58:50 +0000 (11:58 -0400)
committer	The Android Automerger <android-build@android.com>
	Mon, 28 Sep 2015 23:29:49 +0000 (16:29 -0700)
commit	2de275c9a3b0f472f617089f1f817b09f6dad493
tree	50d5efa19e9d5377bd1e95142ad1e472b229404a	tree \| snapshot
parent	92451b8b8183a42e5a160281bfd052047a130102	commit \| diff

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		diff \| blob \| history
core/java/android/net/NetworkCapabilities.java		diff \| blob \| history
core/java/android/net/NetworkRequest.java		diff \| blob \| history
core/java/android/os/INetworkManagementService.aidl		diff \| blob \| history
services/core/java/com/android/server/ConnectivityService.java		diff \| blob \| history
services/core/java/com/android/server/NetworkManagementService.java		diff \| blob \| history