LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

am 0ed58c3f: Merge "Bug: 21588539 Move CHANGE_NETWORK_STATE to be in SYSTEM_SETTINGS" into mnc-dev

Browse Source 
* commit '0ed58c3f002db531fa499913f8ba047a62f39df3':
  Bug: 21588539 Move CHANGE_NETWORK_STATE to be in SYSTEM_SETTINGS
This commit is contained in:
Billy Lau
2015-08-07 22:22:24 +00:00
committed by Android Git Automerger
parent 4f74dbe114 0ed58c3f00
commit a0984c71a1
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/java/android/net/ConnectivityManager.java
View File

@@ -1550,8 +1550,9 @@ public class ConnectivityManager {
context.enforceCallingOrSelfPermission( context.enforceCallingOrSelfPermission(
android.Manifest.permission.CONNECTIVITY_INTERNAL, "ConnectivityService"); android.Manifest.permission.CONNECTIVITY_INTERNAL, "ConnectivityService");
} else { } else {
context.enforceCallingOrSelfPermission( int uid = Binder.getCallingUid();
android.Manifest.permission.CHANGE_NETWORK_STATE, "ConnectivityService"); Settings.checkAndNoteChangeNetworkStateOperation(context, uid, Settings
.getPackageNameForUid(context, uid), true);
} }
} }

7
services/core/java/com/android/server/ConnectivityService.java
View File

@@ -1440,9 +1440,10 @@ public class ConnectivityService extends IConnectivityManager.Stub
} }
private void enforceChangePermission() { private void enforceChangePermission() {
mContext.enforceCallingOrSelfPermission( int uid = Binder.getCallingUid();
android.Manifest.permission.CHANGE_NETWORK_STATE, Settings.checkAndNoteChangeNetworkStateOperation(mContext, uid, Settings
"ConnectivityService"); .getPackageNameForUid(mContext, uid), true);
} }
private void enforceTetherAccessPermission() { private void enforceTetherAccessPermission() {