Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

P

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

Snippets Groups Projects

36337e9a

Commit 36337e9a authored 5 years ago by Automerger Merge Worker

Downloads
- Plain Diff

Merge "Add API for CaptivePortalData" am: 144519f4 am: f3011f77

Change-Id: Ifed2e05d433dda40615af4b41d1f8cf4e9445de0

parents c6ac7503 f3011f77

No related merge requests found

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

api/system-current.txt 31 additions, 0 deletions

api/system-current.txt
api/test-current.txt 31 additions, 0 deletions

api/test-current.txt
core/java/android/net/CaptivePortalData.aidl 19 additions, 0 deletions

core/java/android/net/CaptivePortalData.aidl
core/java/android/net/CaptivePortalData.java 281 additions, 0 deletions

core/java/android/net/CaptivePortalData.java
core/java/android/net/LinkProperties.java 148 additions, 21 deletions

core/java/android/net/LinkProperties.java
core/java/android/net/Uri.aidl 1 addition, 1 deletion

core/java/android/net/Uri.aidl
services/core/java/com/android/server/ConnectivityService.java 47 additions, 21 deletions

...ces/core/java/com/android/server/ConnectivityService.java
tests/net/common/java/android/net/LinkPropertiesTest.java 40 additions, 1 deletion

tests/net/common/java/android/net/LinkPropertiesTest.java
tests/net/java/android/net/CaptivePortalDataTest.kt 72 additions, 0 deletions

tests/net/java/android/net/CaptivePortalDataTest.kt
tests/net/java/com/android/server/ConnectivityServiceTest.java 103 additions, 6 deletions

.../net/java/com/android/server/ConnectivityServiceTest.java

with 773 additions and 50 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