Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix captive portal app can be launched w/o MAINLINE_NETWORK_STACK permission" into qt-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2019-05-15 04:38:57 +00:00
committed by Android (Google) Code Review
parent 18cb49bbab eb20d2a231
commit 53e2a9b0ae
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

@@ -3497,7 +3497,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);