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

Stop using NetworkStack#checkNetworkStackPermission*

Browse Source 
Replace them with PermissionUtils.enforceNetworkStackPermission*
since those methods are deprecated.

Bug: 177187957
Test: atest EthernetServiceTests
Change-Id: Ifde4a8898439b86e6cc49b7469787bc5e4a91835
This commit is contained in:
paulhu
2021-09-15 16:53:45 +08:00
parent 03f03d7acf
commit d6789606d5
2 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -22,16 +22,15 @@ import android.net.IEthernetManager;
import android.net.IEthernetServiceListener; import android.net.IEthernetServiceListener;
import android.net.ITetheredInterfaceCallback; import android.net.ITetheredInterfaceCallback;
import android.net.IpConfiguration; import android.net.IpConfiguration;
import android.net.NetworkStack;
import android.os.Binder; import android.os.Binder;
import android.os.Handler; import android.os.Handler;
import android.os.HandlerThread; import android.os.HandlerThread;
import android.os.RemoteException; import android.os.RemoteException;
import android.provider.Settings;
import android.util.Log; import android.util.Log;
import android.util.PrintWriterPrinter; import android.util.PrintWriterPrinter;
import com.android.internal.util.IndentingPrintWriter; import com.android.internal.util.IndentingPrintWriter;
import com.android.net.module.util.PermissionUtils;
import java.io.FileDescriptor; import java.io.FileDescriptor;
import java.io.PrintWriter; import java.io.PrintWriter;
@@ -115,7 +114,7 @@ public class EthernetServiceImpl extends IEthernetManager.Stub {
Log.w(TAG, "System isn't ready enough to change ethernet configuration"); Log.w(TAG, "System isn't ready enough to change ethernet configuration");
} }
NetworkStack.checkNetworkStackPermission(mContext); PermissionUtils.enforceNetworkStackPermission(mContext);
if (mTracker.isRestrictedInterface(iface)) { if (mTracker.isRestrictedInterface(iface)) {
enforceUseRestrictedNetworksPermission(); enforceUseRestrictedNetworksPermission();
@@ -166,7 +165,7 @@ public class EthernetServiceImpl extends IEthernetManager.Stub {
@Override @Override
public void setIncludeTestInterfaces(boolean include) { public void setIncludeTestInterfaces(boolean include) {
NetworkStack.checkNetworkStackPermissionOr(mContext, PermissionUtils.enforceNetworkStackPermissionOr(mContext,
android.Manifest.permission.NETWORK_SETTINGS); android.Manifest.permission.NETWORK_SETTINGS);
mTracker.setIncludeTestInterfaces(include); mTracker.setIncludeTestInterfaces(include);
} }
@@ -174,7 +173,7 @@ public class EthernetServiceImpl extends IEthernetManager.Stub {
@Override @Override
public void requestTetheredInterface(ITetheredInterfaceCallback callback) { public void requestTetheredInterface(ITetheredInterfaceCallback callback) {
Objects.requireNonNull(callback, "callback must not be null"); Objects.requireNonNull(callback, "callback must not be null");
NetworkStack.checkNetworkStackPermissionOr(mContext, PermissionUtils.enforceNetworkStackPermissionOr(mContext,
android.Manifest.permission.NETWORK_SETTINGS); android.Manifest.permission.NETWORK_SETTINGS);
mTracker.requestTetheredInterface(callback); mTracker.requestTetheredInterface(callback);
} }
@@ -182,7 +181,7 @@ public class EthernetServiceImpl extends IEthernetManager.Stub {
@Override @Override
public void releaseTetheredInterface(ITetheredInterfaceCallback callback) { public void releaseTetheredInterface(ITetheredInterfaceCallback callback) {
Objects.requireNonNull(callback, "callback must not be null"); Objects.requireNonNull(callback, "callback must not be null");
NetworkStack.checkNetworkStackPermissionOr(mContext, PermissionUtils.enforceNetworkStackPermissionOr(mContext,
android.Manifest.permission.NETWORK_SETTINGS); android.Manifest.permission.NETWORK_SETTINGS);
mTracker.releaseTetheredInterface(callback); mTracker.releaseTetheredInterface(callback);
} }

4
service-t/src/com/android/server/ethernet/EthernetTracker.java
View File

@@ -29,7 +29,6 @@ import android.net.IpConfiguration.IpAssignment;
import android.net.IpConfiguration.ProxySettings; import android.net.IpConfiguration.ProxySettings;
import android.net.LinkAddress; import android.net.LinkAddress;
import android.net.NetworkCapabilities; import android.net.NetworkCapabilities;
import android.net.NetworkStack;
import android.net.StaticIpConfiguration; import android.net.StaticIpConfiguration;
import android.os.Handler; import android.os.Handler;
import android.os.IBinder; import android.os.IBinder;
@@ -45,6 +44,7 @@ import android.net.util.NetdService;
import com.android.internal.annotations.VisibleForTesting; import com.android.internal.annotations.VisibleForTesting;
import com.android.internal.util.IndentingPrintWriter; import com.android.internal.util.IndentingPrintWriter;
import com.android.net.module.util.NetdUtils; import com.android.net.module.util.NetdUtils;
import com.android.net.module.util.PermissionUtils;
import com.android.server.net.BaseNetworkObserver; import com.android.server.net.BaseNetworkObserver;
import java.io.FileDescriptor; import java.io.FileDescriptor;
@@ -287,7 +287,7 @@ final class EthernetTracker {
InterfaceConfiguration config = null; InterfaceConfiguration config = null;
// Bring up the interface so we get link status indications. // Bring up the interface so we get link status indications.
try { try {
NetworkStack.checkNetworkStackPermission(mContext); PermissionUtils.enforceNetworkStackPermission(mContext);
NetdUtils.setInterfaceUp(mNetd, iface); NetdUtils.setInterfaceUp(mNetd, iface);
config = mNMService.getInterfaceConfig(iface); config = mNMService.getInterfaceConfig(iface);
} catch (RemoteException | IllegalStateException e) { } catch (RemoteException | IllegalStateException e) {