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

Using PermissionUtils for common net permissions

Browse Source 
Code clean-up to use PermissionUtils for common networking
permissions. Should be a no-op.

Bug: 210485380
Test: make, flash and boot
Change-Id: I4be08243156e9d04f4b3b44ab7328d0f6f7fdda1
This commit is contained in:
James Mattis
2021-12-28 18:24:42 -08:00
parent a5f724dfdd
commit 54e3aebb95
1 changed files with 10 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -61,18 +61,6 @@ public class EthernetServiceImpl extends IEthernetManager.Stub {
mTracker = tracker;
}
private void enforceAccessPermission() {
mContext.enforceCallingOrSelfPermission(
android.Manifest.permission.ACCESS_NETWORK_STATE,
"EthernetService");
}
private void enforceUseRestrictedNetworksPermission() {
mContext.enforceCallingOrSelfPermission(
android.Manifest.permission.CONNECTIVITY_USE_RESTRICTED_NETWORKS,
"ConnectivityService");
}
private void enforceAutomotiveDevice(final @NonNull String methodName) {
PermissionUtils.enforceSystemFeature(mContext, PackageManager.FEATURE_AUTOMOTIVE,
methodName + " is only available on automotive devices.");
@@ -85,9 +73,8 @@ public class EthernetServiceImpl extends IEthernetManager.Stub {
}
private boolean checkUseRestrictedNetworksPermission() {
return mContext.checkCallingOrSelfPermission(
android.Manifest.permission.CONNECTIVITY_USE_RESTRICTED_NETWORKS)
== PackageManager.PERMISSION_GRANTED;
return PermissionUtils.checkAnyPermissionOf(mContext,
android.Manifest.permission.CONNECTIVITY_USE_RESTRICTED_NETWORKS);
}
public void start() {
@@ -104,8 +91,7 @@ public class EthernetServiceImpl extends IEthernetManager.Stub {
@Override
public String[] getAvailableInterfaces() throws RemoteException {
enforceAccessPermission();
PermissionUtils.enforceAccessNetworkStatePermission(mContext, TAG);
return mTracker.getInterfaces(checkUseRestrictedNetworksPermission());
}
@@ -115,10 +101,9 @@ public class EthernetServiceImpl extends IEthernetManager.Stub {
*/
@Override
public IpConfiguration getConfiguration(String iface) {
enforceAccessPermission();
PermissionUtils.enforceAccessNetworkStatePermission(mContext, TAG);
if (mTracker.isRestrictedInterface(iface)) {
enforceUseRestrictedNetworksPermission();
PermissionUtils.enforceRestrictedNetworkPermission(mContext, TAG);
}
return new IpConfiguration(mTracker.getIpConfiguration(iface));
@@ -132,9 +117,8 @@ public class EthernetServiceImpl extends IEthernetManager.Stub {
logIfEthernetNotStarted();
PermissionUtils.enforceNetworkStackPermission(mContext);
if (mTracker.isRestrictedInterface(iface)) {
enforceUseRestrictedNetworksPermission();
PermissionUtils.enforceRestrictedNetworkPermission(mContext, TAG);
}
// TODO: this does not check proxy settings, gateways, etc.
@@ -147,10 +131,9 @@ public class EthernetServiceImpl extends IEthernetManager.Stub {
*/
@Override
public boolean isAvailable(String iface) {
enforceAccessPermission();
PermissionUtils.enforceAccessNetworkStatePermission(mContext, TAG);
if (mTracker.isRestrictedInterface(iface)) {
enforceUseRestrictedNetworksPermission();
PermissionUtils.enforceRestrictedNetworkPermission(mContext, TAG);
}
return mTracker.isTrackingInterface(iface);
@@ -164,7 +147,7 @@ public class EthernetServiceImpl extends IEthernetManager.Stub {
if (listener == null) {
throw new IllegalArgumentException("listener must not be null");
}
enforceAccessPermission();
PermissionUtils.enforceAccessNetworkStatePermission(mContext, TAG);
mTracker.addListener(listener, checkUseRestrictedNetworksPermission());
}
@@ -176,7 +159,7 @@ public class EthernetServiceImpl extends IEthernetManager.Stub {
if (listener == null) {
throw new IllegalArgumentException("listener must not be null");
}
enforceAccessPermission();
PermissionUtils.enforceAccessNetworkStatePermission(mContext, TAG);
mTracker.removeListener(listener);
}