From 4ab1ffca29e7d065d1a4e0c3ef89b7f9c446d81e Mon Sep 17 00:00:00 2001 From: James Mattis Date: Sun, 26 Dec 2021 12:56:52 -0800 Subject: [PATCH] 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 --- service/src/com/android/server/ConnectivityService.java | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/service/src/com/android/server/ConnectivityService.java b/service/src/com/android/server/ConnectivityService.java index 6227bb25b9..a59b5d6178 100644 --- a/service/src/com/android/server/ConnectivityService.java +++ b/service/src/com/android/server/ConnectivityService.java @@ -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."); } /**