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

Merge "Add android.net.CaptivePortal class for captive-portal-handling-app callbacks" into mnc-dev

Browse Source
This commit is contained in:
Paul Jensen
2015-07-10 14:57:09 +00:00
committed by Android (Google) Code Review
parent 7fb8adcd51 75e0adb220
commit f2479b9d50
4 changed files with 129 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2750,16 +2750,6 @@ public class ConnectivityService extends IConnectivityManager.Stub
}
}
public void captivePortalAppResponse(Network network, int response, String actionToken) {
if (response == ConnectivityManager.CAPTIVE_PORTAL_APP_RETURN_WANTED_AS_IS) {
enforceConnectivityInternalPermission();
}
final NetworkAgentInfo nai = getNetworkAgentInfoForNetwork(network);
if (nai == null) return;
nai.networkMonitor.sendMessage(NetworkMonitor.CMD_CAPTIVE_PORTAL_APP_FINISHED, response, 0,
actionToken);
}
private ProxyInfo getDefaultProxy() {
// this information is already available as a world read/writable jvm property
// so this API change wouldn't have a benifit. It also breaks the passing