summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator.cpp
diff options
context:
space:
mode:
authorHugo Benichi <hugobenichi@google.com>2017-06-17 13:36:35 +0900
committerHugo Benichi <hugobenichi@google.com>2017-07-14 14:54:58 +0900
commit12df465997c1be51c6802acad2dcf20f010c3576 (patch)
treed2cf116c309132e54d9ceab99795e255e41d31d2 /tools/aapt2/java/JavaClassGenerator.cpp
parent1cdcaa8cf3ef1ec14014b0e84af3b1cd383c25db (diff)
CaptivePortalLogin ignores some ssl errors.
This patch changes the ssl error handler of the captive portal login activity to ignore errors for resources coming from a different hostname that the top-level page currently loading. This allows logging into misconfigured portals that incorrectly bans ssl to some hostnames necessary for loading their portal login pages. Bug: 62332137 Test: manually tested with captive portal entwork. (cherry pick from commit 22542ed48090e2e6e9474b658fdd368041a4060b which was skipped from merging into oc-dr1-dev-plus-aosp because of previous cherry picks and incorrect Merged-In annotations) Change-Id: Idb6ffac2d97b15cfdbe524b91c84dd29ae0be00b
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions