diff options
| author | Billy Lau <billylau@google.com> | 2015-08-01 12:45:02 +0100 |
|---|---|---|
| committer | Billy Lau <billylau@google.com> | 2015-08-07 19:29:51 +0100 |
| commit | a7238a397d5c3431eeb19b5b77e8c7c2bf0e608f (patch) | |
| tree | 3580247aad3bc51ff3eb88c592f19692c5cde81f /services/core/java/com/android/server/ConnectivityService.java | |
| parent | 385dfd349ff773c499859ee44552995e9c25759c (diff) | |
| download | frameworks_base-a7238a397d5c3431eeb19b5b77e8c7c2bf0e608f.zip frameworks_base-a7238a397d5c3431eeb19b5b77e8c7c2bf0e608f.tar.gz frameworks_base-a7238a397d5c3431eeb19b5b77e8c7c2bf0e608f.tar.bz2 | |
Bug: 21588539 Move CHANGE_NETWORK_STATE to be in SYSTEM_SETTINGS
Merge the CHANGE_NETWORK_STATE permission with WRITE_SETTINGS.
AndroidManifest.xml:
Raised the protection level of CHANGE_NETWORK_STATE permission from
normal to signature|appops and pre23|preinstall for compatibility
provider/Settings:
Wrote new helper methods to check if app is allowed to change network
state.
ConnectivityManager.java & ConnectivityService.java:
Replace enforcement checks for CHANGE_NETWORK_STATE with
checkAndNoteChangeNetworkStateOperations instead.
Change-Id: If8c2dd3c76a5324ca43f1d90fa17973216c2bcc5
Diffstat (limited to 'services/core/java/com/android/server/ConnectivityService.java')
| -rw-r--r-- | services/core/java/com/android/server/ConnectivityService.java | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/services/core/java/com/android/server/ConnectivityService.java b/services/core/java/com/android/server/ConnectivityService.java index 6a22f22..e0b708e 100644 --- a/services/core/java/com/android/server/ConnectivityService.java +++ b/services/core/java/com/android/server/ConnectivityService.java @@ -1432,9 +1432,10 @@ public class ConnectivityService extends IConnectivityManager.Stub } private void enforceChangePermission() { - mContext.enforceCallingOrSelfPermission( - android.Manifest.permission.CHANGE_NETWORK_STATE, - "ConnectivityService"); + int uid = Binder.getCallingUid(); + Settings.checkAndNoteChangeNetworkStateOperation(mContext, uid, Settings + .getPackageNameForUid(mContext, uid), true); + } private void enforceTetherAccessPermission() { |