diff options
| author | Lorenzo Colitti <lorenzo@google.com> | 2015-10-22 06:15:05 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-10-22 06:15:05 +0000 |
| commit | 809dcade9906001f6aa51a68aa783e20bb1d7c0d (patch) | |
| tree | 67b733596e2b983339bcc7cdf721e0bed16fa5db /services | |
| parent | 0dccd128001ceff9437f736bd70dfd1986e315d5 (diff) | |
| parent | d54270506669e474b5b8d1703212c77780a04ae9 (diff) | |
| download | frameworks_base-809dcade9906001f6aa51a68aa783e20bb1d7c0d.zip frameworks_base-809dcade9906001f6aa51a68aa783e20bb1d7c0d.tar.gz frameworks_base-809dcade9906001f6aa51a68aa783e20bb1d7c0d.tar.bz2 | |
Merge "Reinstate CHANGE_NETWORK_STATE as a normal permission." into mnc-dr-dev
Diffstat (limited to 'services')
| -rw-r--r-- | services/core/java/com/android/server/ConnectivityService.java | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/services/core/java/com/android/server/ConnectivityService.java b/services/core/java/com/android/server/ConnectivityService.java index 3860005..327fb8a 100644 --- a/services/core/java/com/android/server/ConnectivityService.java +++ b/services/core/java/com/android/server/ConnectivityService.java @@ -1447,10 +1447,7 @@ public class ConnectivityService extends IConnectivityManager.Stub } private void enforceChangePermission() { - int uid = Binder.getCallingUid(); - Settings.checkAndNoteChangeNetworkStateOperation(mContext, uid, Settings - .getPackageNameForUid(mContext, uid), true); - + ConnectivityManager.enforceChangePermission(mContext); } private void enforceTetherAccessPermission() { |