Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am c24c0e9b: Merge change Ib8f16340 into eclair-mr2

Browse Source 
Merge commit 'c24c0e9b5f81541af5d3094774eeebb4216655c5' into eclair-mr2-plus-aosp

* commit 'c24c0e9b5f81541af5d3094774eeebb4216655c5':
  Fix ConnectivityManager permissions check.
This commit is contained in:
Robert Greenwalt
2009-10-07 11:52:32 -07:00
committed by Android Git Automerger
parent fface18d25 c24c0e9b5f
commit 91f360869e
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/java/com/android/server/ConnectivityService.java
View File

@@ -572,6 +572,8 @@ public class ConnectivityService extends IConnectivityManager.Stub {
// javadoc from interface // javadoc from interface
public int stopUsingNetworkFeature(int networkType, String feature) { public int stopUsingNetworkFeature(int networkType, String feature) {
enforceChangePermission();
int pid = getCallingPid(); int pid = getCallingPid();
int uid = getCallingUid(); int uid = getCallingUid();
@@ -611,7 +613,7 @@ public class ConnectivityService extends IConnectivityManager.Stub {
Log.d(TAG, "stopUsingNetworkFeature for net " + networkType + Log.d(TAG, "stopUsingNetworkFeature for net " + networkType +
": " + feature); ": " + feature);
} }
enforceChangePermission();
if (!ConnectivityManager.isNetworkTypeValid(networkType)) { if (!ConnectivityManager.isNetworkTypeValid(networkType)) {
return -1; return -1;
} }