diff options
| author | Billy Lau <billylau@google.com> | 2015-08-07 22:16:03 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-08-07 22:16:03 +0000 |
| commit | 70f998e57df2b3ed79331669a93a0ba314f25e7d (patch) | |
| tree | 1cf8aecb11bdf22074bf7e0bb1c0d4637858e2f0 /services/core/java/com/android/server/ConnectivityService.java | |
| parent | f0e5501e093c688cd293308e0aafc2b55326c255 (diff) | |
| parent | a7238a397d5c3431eeb19b5b77e8c7c2bf0e608f (diff) | |
| download | frameworks_base-70f998e57df2b3ed79331669a93a0ba314f25e7d.zip frameworks_base-70f998e57df2b3ed79331669a93a0ba314f25e7d.tar.gz frameworks_base-70f998e57df2b3ed79331669a93a0ba314f25e7d.tar.bz2 | |
Merge "Bug: 21588539 Move CHANGE_NETWORK_STATE to be in SYSTEM_SETTINGS" into mnc-dev
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 0802d30..6e0c37f 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() { |