Commit eb20d2a2 authored May 14, 2019 by Paul Hu

Fix captive portal app can be launched w/o MAINLINE_NETWORK_STACK permission

Caller should get SecurityException if called
ConnectivityManager#startCaptivePortalApp() w/o
MAINLINE_NETWORK_STACK permission. But now it will not get any
exception and can launch captive portal app successfully.

Bug: 132662433
Test: atest android.net.cts.ConnectivityManagerTest#testStartCaptivePortalApp
      w and w/o MAINLINE_NETWORK_STACK permission
Test: atest FrameworksNetTests NetworkStackTests

Change-Id: Ib70fe6fad107f3e9dce9ce673188c5ce5dc1ad7b
Merged-In: I1025da29beb53259f57bd9ca5648b32f2847ed4a
Merged-In: Ib70fe6fad107f3e9dce9ce673188c5ce5dc1ad7b
(cherry picked from commit 72b3ab18)

parent 92f755e3

services/core/java/com/android/server/ConnectivityService.java

+2 −1

Original line number	Diff line number	Diff line
		@@ -3497,7 +3497,8 @@ public class ConnectivityService extends IConnectivityManager.Stub
		*/
		@Override
		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);
		appIntent.putExtras(appExtras);