Update to ConnectivityService to use utils

Update to ConnectivityService to use permission utils to validate the
existence of a system feature.

Bug: 210485380
Test: atest FrameworksNetTests:
com.android.server.ConnectivityServiceTest

Change-Id: Ia537cc5b37ef8d80f49f1a83ba572b3b8a9f6874
This commit is contained in:
James Mattis
2021-12-26 12:56:52 -08:00
parent ee7ca130dc
commit 4ab1ffca29

View File

@@ -10235,13 +10235,9 @@ public class ConnectivityService extends IConnectivityManager.Stub
}
private void enforceAutomotiveDevice() {
final boolean isAutomotiveDevice =
mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_AUTOMOTIVE);
if (!isAutomotiveDevice) {
throw new UnsupportedOperationException(
PermissionUtils.enforceSystemFeature(mContext, PackageManager.FEATURE_AUTOMOTIVE,
"setOemNetworkPreference() is only available on automotive devices.");
}
}
/**
* Used by automotive devices to set the network preferences used to direct traffic at an