OSDN Git Service

Support bypassing TLS in the framework
authorErik Kline <ek@google.com>
Wed, 21 Mar 2018 14:18:33 +0000 (07:18 -0700)
committerErik Kline <ek@google.com>
Tue, 3 Apr 2018 07:35:30 +0000 (00:35 -0700)
commit2140529d9b8e116d88c2a385a0b3179c2ede5ad7
treea6693ad493766b407499065ddbe7518e455578c0
parente34c426fd346d041176c83393bb78abfd49f6e9f
Support bypassing TLS in the framework

This change comprises the following parts:

    [1] android.net.dns.ResolvUtil, containing methods that encapsulate the
        use of the high bit in netids used in DNS resolution contexts.

    [2] Updates to captive portal apps to call the ResolvUtil method that
        enables DNS-over-TLS bypass for the captive portal app process.

Test: as follows
    - builds
    - flashes
    - boots
    - runtest frameworks-net passes
Bug: 64133961
Bug: 72345192

Change-Id: I2072c1f68d6978fa0d7e9d8693135a2c51bb0f87
packages/CaptivePortalLogin/Android.mk
packages/CaptivePortalLogin/src/com/android/captiveportallogin/CaptivePortalLoginActivity.java
packages/CarrierDefaultApp/Android.mk
packages/CarrierDefaultApp/src/com/android/carrierdefaultapp/CaptivePortalLoginActivity.java
services/core/java/com/android/server/connectivity/DnsManager.java
services/net/java/android/net/dns/ResolvUtil.java [new file with mode: 0644]