Commit 1d714a76 authored Aug 28, 2015 by Paul Jensen Committed by Zach Jang Sep 28, 2015

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 af171aa4)

Resolved conflicts from cherry-picking ag/758371 into the lmp-mr1-release branch.

parent df31d37d

src/java/com/android/internal/telephony/dataconnection/DataConnection.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -944,7 +944,7 @@ public final class DataConnection extends StateMachine {
		default:
		}
		}
		ConnectivityManager.maybeMarkCapabilitiesRestricted(result);
		result.maybeMarkCapabilitiesRestricted();
		}
		int up = 14;
		int down = 14;