commit 3e81fb6ecfc5aa401baf5b07ba74acb772c89b0b
author Lorenzo Colitti <lorenzo@google.com> Thu Oct 15 16:59:07 2015 +0900
committer Lorenzo Colitti <lorenzo@google.com> Thu Oct 15 16:59:07 2015 +0900
tree caf97e386b3184156f42bfa55c02c1f8dc40b575
parent 9fc9da2b2d8837165f0fc3819d702959c367299f

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

java/com/android/server/ethernet/EthernetServiceImpl.java

diff --git a/java/com/android/server/ethernet/EthernetServiceImpl.java b/java/com/android/server/ethernet/EthernetServiceImpl.java
index 0c84bef..42996d6 100644
--- a/java/com/android/server/ethernet/EthernetServiceImpl.java
+++ b/java/com/android/server/ethernet/EthernetServiceImpl.java
@@ -74,12 +74,6 @@
                 "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 @@
             Log.w(TAG, "System isn't ready enough to change ethernet configuration");
         }
 
-        enforceChangePermission();
         enforceConnectivityInternalPermission();
 
         synchronized (mIpConfiguration) {