Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

P

platform_frameworks_base
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Requirements
- Environments
- Terraform modules
- Incidents
- Service Desk

Snippets Groups Projects

d965c5de

Commit d965c5de authored 1 year ago by Pete Bentley Committed by Automerger Merge Worker 1 year ago

Downloads
- Plain Diff

Merge "Fix up NetworkSecurityConfigTests." into main am: 95030647

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2750902

Change-Id: Ia23b2d5500cc594cac2c6832adfe2855f6b9d499
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

parents bbbfcfa7 95030647

No related branches found

No related tags found

No related merge requests found

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

tests/NetworkSecurityConfigTest/res/raw/ca_certs_der.der 0 additions, 0 deletions

tests/NetworkSecurityConfigTest/res/raw/ca_certs_der.der
tests/NetworkSecurityConfigTest/res/raw/ca_certs_pem.pem 29 additions, 33 deletions

tests/NetworkSecurityConfigTest/res/raw/ca_certs_pem.pem
tests/NetworkSecurityConfigTest/res/xml/domain_whitespace.xml 1 addition, 1 deletion

...s/NetworkSecurityConfigTest/res/xml/domain_whitespace.xml
tests/NetworkSecurityConfigTest/res/xml/nested_domains.xml 1 addition, 1 deletion

tests/NetworkSecurityConfigTest/res/xml/nested_domains.xml
tests/NetworkSecurityConfigTest/res/xml/pins1.xml 1 addition, 1 deletion

tests/NetworkSecurityConfigTest/res/xml/pins1.xml
tests/NetworkSecurityConfigTest/src/android/security/net/config/NetworkSecurityConfigTests.java 10 additions, 16 deletions

...droid/security/net/config/NetworkSecurityConfigTests.java
tests/NetworkSecurityConfigTest/src/android/security/net/config/TestUtils.java 10 additions, 8 deletions

...ConfigTest/src/android/security/net/config/TestUtils.java
tests/NetworkSecurityConfigTest/src/android/security/net/config/XmlConfigTests.java 11 additions, 19 deletions

...gTest/src/android/security/net/config/XmlConfigTests.java

with 63 additions and 79 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment