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

Merge "Fix captive portal app can be launched w/o MAINLINE_NETWORK_STACK permission" am: c381068caa

Browse Source 
am: fb8186d0a9

Change-Id: I1025da29beb53259f57bd9ca5648b32f2847ed4a
This commit is contained in:
Paul Hu
2019-05-14 04:17:29 -07:00
committed by android-build-merger
parent 9313f7adf9 fb8186d0a9
commit a4980fc1fd
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
services/core/java/com/android/server/ConnectivityService.java
View File

@@ -3495,7 +3495,8 @@ public class ConnectivityService extends IConnectivityManager.Stub
*/ */
@Override @Override
public void startCaptivePortalAppInternal(Network network, Bundle appExtras) { public void startCaptivePortalAppInternal(Network network, Bundle appExtras) {
mContext.checkCallingOrSelfPermission(NetworkStack.PERMISSION_MAINLINE_NETWORK_STACK); mContext.enforceCallingOrSelfPermission(NetworkStack.PERMISSION_MAINLINE_NETWORK_STACK,
"ConnectivityService");
final Intent appIntent = new Intent(ConnectivityManager.ACTION_CAPTIVE_PORTAL_SIGN_IN); final Intent appIntent = new Intent(ConnectivityManager.ACTION_CAPTIVE_PORTAL_SIGN_IN);
appIntent.putExtras(appExtras); appIntent.putExtras(appExtras);