diff options
| author | Paul Jensen <pauljensen@google.com> | 2015-08-28 11:37:01 -0400 |
|---|---|---|
| committer | The Android Automerger <android-build@android.com> | 2015-10-21 11:52:38 -0700 |
| commit | 30153db7bfff29f6ddcdce88931046097e894bc0 (patch) | |
| tree | 2395bce39d5a6bc29237121327533f159c143e1c | |
| parent | 85d245a2e87a4e8e48f1eda87feefcdb821c329d (diff) | |
| download | telephony-lollipop-mr1-wfc-release.tar.gz | |
Fix NOT_RESTRICTED network capability and enforce it.android-5.1.1_r28lollipop-mr1-wfc-release
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.
| -rw-r--r-- | src/java/com/android/internal/telephony/dataconnection/DataConnection.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/java/com/android/internal/telephony/dataconnection/DataConnection.java b/src/java/com/android/internal/telephony/dataconnection/DataConnection.java index 0b39944720..da2e849ff5 100644 --- a/src/java/com/android/internal/telephony/dataconnection/DataConnection.java +++ b/src/java/com/android/internal/telephony/dataconnection/DataConnection.java @@ -946,7 +946,7 @@ public final class DataConnection extends StateMachine { default: } } - ConnectivityManager.maybeMarkCapabilitiesRestricted(result); + result.maybeMarkCapabilitiesRestricted(); } int up = 14; int down = 14; |