From 189063ffb07649413d850055fe25da6b3aee3170 Mon Sep 17 00:00:00 2001 From: Lorenzo Colitti Date: Thu, 15 Oct 2015 16:59:07 +0900 Subject: [PATCH] Stop requiring CHANGE_NETWORK_STATE to change Ethernet config. Requiring CHANGE_NETWORK_STATE is pointless, since immediately after doing that we require CONNECTIVITY_INTERNAL, which is a system-only permission. Bug: 23597341 Change-Id: If4c8ecbb319e547c2c81d2dcc3c7bbb63e0bc2af --- .../com/android/server/ethernet/EthernetServiceImpl.java | 7 ------- 1 file changed, 7 deletions(-) diff --git a/service-t/src/com/android/server/ethernet/EthernetServiceImpl.java b/service-t/src/com/android/server/ethernet/EthernetServiceImpl.java index 0c84befbcd..42996d6826 100644 --- a/service-t/src/com/android/server/ethernet/EthernetServiceImpl.java +++ b/service-t/src/com/android/server/ethernet/EthernetServiceImpl.java @@ -74,12 +74,6 @@ public class EthernetServiceImpl extends IEthernetManager.Stub { "EthernetService"); } - private void enforceChangePermission() { - int uid = Binder.getCallingUid(); - Settings.checkAndNoteChangeNetworkStateOperation(mContext, uid, Settings - .getPackageNameForUid(mContext, uid), true); - } - private void enforceConnectivityInternalPermission() { mContext.enforceCallingOrSelfPermission( android.Manifest.permission.CONNECTIVITY_INTERNAL, @@ -120,7 +114,6 @@ public class EthernetServiceImpl extends IEthernetManager.Stub { Log.w(TAG, "System isn't ready enough to change ethernet configuration"); } - enforceChangePermission(); enforceConnectivityInternalPermission(); synchronized (mIpConfiguration) {