Merge tag 'android-6.0.1_r3' into 601r3
Android 6.0.1 release 3
* tag 'android-6.0.1_r3':
Stop requiring CHANGE_NETWORK_STATE to change Ethernet config.
Change-Id: I27e05c3978bb5b82331c81fd1e60a10616a1bd02
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) {