diff options
| -rw-r--r-- | packages/CaptivePortalLogin/AndroidManifest.xml | 2 | ||||
| -rw-r--r-- | services/core/java/com/android/server/ConnectivityService.java | 9 |
2 files changed, 3 insertions, 8 deletions
diff --git a/packages/CaptivePortalLogin/AndroidManifest.xml b/packages/CaptivePortalLogin/AndroidManifest.xml index 91bc505cb610..5fc9627e39c9 100644 --- a/packages/CaptivePortalLogin/AndroidManifest.xml +++ b/packages/CaptivePortalLogin/AndroidManifest.xml @@ -22,7 +22,7 @@ <uses-permission android:name="android.permission.INTERNET" /> <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /> <uses-permission android:name="android.permission.CONNECTIVITY_INTERNAL" /> - <uses-permission android:name="android.permission.NETWORK_STACK" /> + <uses-permission android:name="android.permission.NETWORK_SETTINGS" /> <application android:label="@string/app_name" android:usesCleartextTraffic="true"> diff --git a/services/core/java/com/android/server/ConnectivityService.java b/services/core/java/com/android/server/ConnectivityService.java index 0fe14e1a4831..6bb9021b0510 100644 --- a/services/core/java/com/android/server/ConnectivityService.java +++ b/services/core/java/com/android/server/ConnectivityService.java @@ -1402,7 +1402,7 @@ public class ConnectivityService extends IConnectivityManager.Stub NetworkCapabilities nc, int callerPid, int callerUid) { final NetworkCapabilities newNc = new NetworkCapabilities(nc); if (!checkSettingsPermission(callerPid, callerUid)) newNc.setUids(null); - if (!checkNetworkStackPermission(callerPid, callerUid)) newNc.setSSID(null); + if (!checkSettingsPermission(callerPid, callerUid)) newNc.setSSID(null); return newNc; } @@ -1662,11 +1662,6 @@ public class ConnectivityService extends IConnectivityManager.Stub android.Manifest.permission.NETWORK_SETTINGS, pid, uid); } - private boolean checkNetworkStackPermission(int pid, int uid) { - return PERMISSION_GRANTED == mContext.checkPermission( - android.Manifest.permission.NETWORK_STACK, pid, uid); - } - private void enforceTetherAccessPermission() { mContext.enforceCallingOrSelfPermission( android.Manifest.permission.ACCESS_NETWORK_STATE, @@ -4247,7 +4242,7 @@ public class ConnectivityService extends IConnectivityManager.Stub // calling app has permission to do so. private void ensureSufficientPermissionsForRequest(NetworkCapabilities nc, int callerPid, int callerUid) { - if (null != nc.getSSID() && !checkNetworkStackPermission(callerPid, callerUid)) { + if (null != nc.getSSID() && !checkSettingsPermission(callerPid, callerUid)) { throw new SecurityException("Insufficient permissions to request a specific SSID"); } } |