summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Robert Greenwalt <robdroid@android.com> 2009-10-06 17:52:40 -0700
committer Robert Greenwalt <robdroid@android.com> 2009-10-06 17:52:40 -0700
commitb8f16340b531809aa08cb73c55ddadd5f94de080 (patch)
tree9bc6b9377d9280b9be8cf9e2cde87d2be8b7a1b3
parent1b7ad876f1274787d7609a31e4a2a852adb94c3c (diff)
Fix ConnectivityManager permissions check.
bug: 2160462
-rw-r--r--services/java/com/android/server/ConnectivityService.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/services/java/com/android/server/ConnectivityService.java b/services/java/com/android/server/ConnectivityService.java
index 78215b0af0a1..a91635e74321 100644
--- a/services/java/com/android/server/ConnectivityService.java
+++ b/services/java/com/android/server/ConnectivityService.java
@@ -572,6 +572,8 @@ public class ConnectivityService extends IConnectivityManager.Stub {
// javadoc from interface
public int stopUsingNetworkFeature(int networkType, String feature) {
+ enforceChangePermission();
+
int pid = getCallingPid();
int uid = getCallingUid();
@@ -611,7 +613,7 @@ public class ConnectivityService extends IConnectivityManager.Stub {
Log.d(TAG, "stopUsingNetworkFeature for net " + networkType +
": " + feature);
}
- enforceChangePermission();
+
if (!ConnectivityManager.isNetworkTypeValid(networkType)) {
return -1;
}