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

f76916a1

Commit f76916a1 authored 4 years ago by James Mattis Committed by Gerrit Code Review 4 years ago

Downloads
- Plain Diff

Merge changes Iabad7300,I85363e28

* changes:
  Stubbed setOemNetworkPreference in Connectivity
  Update OemNetworkPreferences to use 1:1 Map

parents 39338def 59084d66

No related branches found

No related tags found

No related merge requests found

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

core/java/android/net/OemNetworkPreferences.java 49 additions, 22 deletions

core/java/android/net/OemNetworkPreferences.java
packages/Connectivity/framework/src/android/net/ConnectivityManager.java 7 additions, 3 deletions

...tivity/framework/src/android/net/ConnectivityManager.java
packages/Connectivity/framework/src/android/net/IConnectivityManager.aidl 3 additions, 0 deletions

...ivity/framework/src/android/net/IConnectivityManager.aidl
services/core/java/com/android/server/ConnectivityService.java 8 additions, 0 deletions

...ces/core/java/com/android/server/ConnectivityService.java
tests/net/common/java/android/net/OemNetworkPreferencesTest.java 68 additions, 24 deletions

...et/common/java/android/net/OemNetworkPreferencesTest.java

with 135 additions and 49 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