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

652aa82d

Commit 652aa82d authored 8 years ago by Etan Cohen Committed by android-build-merger 8 years ago

Downloads
- Plain Diff

Merge "[AWARE] Update network API: make open/encrypted explicit"

am: 3dee2958

Change-Id: Ia77ef6835da6497a1641e1fda3e8de67f86b6690

parents 64e0d455 3dee2958

No related branches found

No related tags found

No related merge requests found

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

api/current.txt 4 additions, 2 deletions

api/current.txt
api/system-current.txt 6 additions, 2 deletions

api/system-current.txt
api/test-current.txt 4 additions, 2 deletions

api/test-current.txt
wifi/java/android/net/wifi/aware/DiscoverySession.java 14 additions, 39 deletions

wifi/java/android/net/wifi/aware/DiscoverySession.java
wifi/java/android/net/wifi/aware/IdentityChangedListener.java 2 additions, 1 deletion

.../java/android/net/wifi/aware/IdentityChangedListener.java
wifi/java/android/net/wifi/aware/PeerHandle.java 3 additions, 2 deletions

wifi/java/android/net/wifi/aware/PeerHandle.java
wifi/java/android/net/wifi/aware/WifiAwareManager.java 16 additions, 8 deletions

wifi/java/android/net/wifi/aware/WifiAwareManager.java
wifi/java/android/net/wifi/aware/WifiAwareSession.java 7 additions, 35 deletions

wifi/java/android/net/wifi/aware/WifiAwareSession.java

with 56 additions and 91 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