commit 1d714a763d4c690e8096b4a3d1daebb543522ac4
author Paul Jensen <pauljensen@google.com> Fri Aug 28 11:37:01 2015 -0400
committer Zach Jang <zachjang@google.com> Mon Sep 28 17:20:00 2015 +0000
tree adc7cbb502d548ae15711d0e2afc3d36cd8fda7c
parent df31d37d285dde9911b699837c351aed2320b586

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

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

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

diff --git a/src/java/com/android/internal/telephony/dataconnection/DataConnection.java b/src/java/com/android/internal/telephony/dataconnection/DataConnection.java
index 21bc671..09b3c9b 100644
--- a/src/java/com/android/internal/telephony/dataconnection/DataConnection.java
+++ b/src/java/com/android/internal/telephony/dataconnection/DataConnection.java
@@ -944,7 +944,7 @@
                     default:
                 }
             }
-            ConnectivityManager.maybeMarkCapabilitiesRestricted(result);
+            result.maybeMarkCapabilitiesRestricted();
         }
         int up = 14;
         int down = 14;