LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "[Ethernet] Replace internal connectivity checks permission" am: cd73c22c96 am: 2afd43ff9f

Browse Source 
am: 63721ec401

Change-Id: I3606bee0a292d70dd140b4e244b8f283e8205c96
This commit is contained in:
Paul Hu
2019-09-20 00:48:36 -07:00
committed by android-build-merger
parent 761a9e0eea 63721ec401
commit 5b12a54294
1 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
service-t/src/com/android/server/ethernet/EthernetServiceImpl.java
View File

@@ -21,6 +21,7 @@ import android.content.pm.PackageManager;
import android.net.IEthernetManager;
import android.net.IEthernetServiceListener;
import android.net.IpConfiguration;
import android.net.NetworkStack;
import android.os.Binder;
import android.os.Handler;
import android.os.HandlerThread;
@@ -57,12 +58,6 @@ public class EthernetServiceImpl extends IEthernetManager.Stub {
"EthernetService");
}
private void enforceConnectivityInternalPermission() {
mContext.enforceCallingOrSelfPermission(
android.Manifest.permission.CONNECTIVITY_INTERNAL,
"ConnectivityService");
}
private void enforceUseRestrictedNetworksPermission() {
mContext.enforceCallingOrSelfPermission(
android.Manifest.permission.CONNECTIVITY_USE_RESTRICTED_NETWORKS,
@@ -117,7 +112,7 @@ public class EthernetServiceImpl extends IEthernetManager.Stub {
Log.w(TAG, "System isn't ready enough to change ethernet configuration");
}
enforceConnectivityInternalPermission();
NetworkStack.checkNetworkStackPermission(mContext);
if (mTracker.isRestrictedInterface(iface)) {
enforceUseRestrictedNetworksPermission();