Update to ConnectivityService to use utils am: 4ab1ffca29 am: 241bbaddf3 am: 2dc89ff07a

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1934218

Change-Id: I168753da01edee9889cd1cb6915f94ec294932d0
This commit is contained in:
James Mattis
2022-01-06 05:08:49 +00:00
committed by Automerger Merge Worker

View File

@@ -10235,12 +10235,8 @@ public class ConnectivityService extends IConnectivityManager.Stub
}
private void enforceAutomotiveDevice() {
final boolean isAutomotiveDevice =
mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_AUTOMOTIVE);
if (!isAutomotiveDevice) {
throw new UnsupportedOperationException(
"setOemNetworkPreference() is only available on automotive devices.");
}
PermissionUtils.enforceSystemFeature(mContext, PackageManager.FEATURE_AUTOMOTIVE,
"setOemNetworkPreference() is only available on automotive devices.");
}
/**