Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "[AWARE] Implement custom Wi-Fi Aware network specifier" into oc-dev

Browse Source
This commit is contained in:
Etan Cohen
2017-04-18 20:04:16 +00:00
committed by Android (Google) Code Review
parent 11fbd2148f 6850728818
commit c367ee166b
8 changed files with 351 additions and 245 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
api/current.txt
View File

@@ -26758,8 +26758,8 @@ package android.net.wifi.aware {
}
public class DiscoverySession {
method public java.lang.String createNetworkSpecifierOpen(android.net.wifi.aware.PeerHandle);
method public java.lang.String createNetworkSpecifierPassphrase(android.net.wifi.aware.PeerHandle, java.lang.String);
method public android.net.NetworkSpecifier createNetworkSpecifierOpen(android.net.wifi.aware.PeerHandle);
method public android.net.NetworkSpecifier createNetworkSpecifierPassphrase(android.net.wifi.aware.PeerHandle, java.lang.String);
method public void destroy();
method public void sendMessage(android.net.wifi.aware.PeerHandle, int, byte[]);
}
@@ -26845,8 +26845,8 @@ package android.net.wifi.aware {
}
public class WifiAwareSession {
method public java.lang.String createNetworkSpecifierOpen(int, byte[]);
method public java.lang.String createNetworkSpecifierPassphrase(int, byte[], java.lang.String);
method public android.net.NetworkSpecifier createNetworkSpecifierOpen(int, byte[]);
method public android.net.NetworkSpecifier createNetworkSpecifierPassphrase(int, byte[], java.lang.String);
method public void destroy();
method public void publish(android.net.wifi.aware.PublishConfig, android.net.wifi.aware.DiscoverySessionCallback, android.os.Handler);
method public void subscribe(android.net.wifi.aware.SubscribeConfig, android.net.wifi.aware.DiscoverySessionCallback, android.os.Handler);

12
api/system-current.txt
View File

@@ -29501,9 +29501,9 @@ package android.net.wifi.aware {
}
public class DiscoverySession {
method public java.lang.String createNetworkSpecifierOpen(android.net.wifi.aware.PeerHandle);
method public java.lang.String createNetworkSpecifierPassphrase(android.net.wifi.aware.PeerHandle, java.lang.String);
method public java.lang.String createNetworkSpecifierPmk(android.net.wifi.aware.PeerHandle, byte[]);
method public android.net.NetworkSpecifier createNetworkSpecifierOpen(android.net.wifi.aware.PeerHandle);
method public android.net.NetworkSpecifier createNetworkSpecifierPassphrase(android.net.wifi.aware.PeerHandle, java.lang.String);
method public android.net.NetworkSpecifier createNetworkSpecifierPmk(android.net.wifi.aware.PeerHandle, byte[]);
method public void destroy();
method public void sendMessage(android.net.wifi.aware.PeerHandle, int, byte[]);
}
@@ -29589,9 +29589,9 @@ package android.net.wifi.aware {
}
public class WifiAwareSession {
method public java.lang.String createNetworkSpecifierOpen(int, byte[]);
method public java.lang.String createNetworkSpecifierPassphrase(int, byte[], java.lang.String);
method public java.lang.String createNetworkSpecifierPmk(int, byte[], byte[]);
method public android.net.NetworkSpecifier createNetworkSpecifierOpen(int, byte[]);
method public android.net.NetworkSpecifier createNetworkSpecifierPassphrase(int, byte[], java.lang.String);
method public android.net.NetworkSpecifier createNetworkSpecifierPmk(int, byte[], byte[]);
method public void destroy();
method public void publish(android.net.wifi.aware.PublishConfig, android.net.wifi.aware.DiscoverySessionCallback, android.os.Handler);
method public void subscribe(android.net.wifi.aware.SubscribeConfig, android.net.wifi.aware.DiscoverySessionCallback, android.os.Handler);

8
api/test-current.txt
View File

@@ -26865,8 +26865,8 @@ package android.net.wifi.aware {
}
public class DiscoverySession {
method public java.lang.String createNetworkSpecifierOpen(android.net.wifi.aware.PeerHandle);
method public java.lang.String createNetworkSpecifierPassphrase(android.net.wifi.aware.PeerHandle, java.lang.String);
method public android.net.NetworkSpecifier createNetworkSpecifierOpen(android.net.wifi.aware.PeerHandle);
method public android.net.NetworkSpecifier createNetworkSpecifierPassphrase(android.net.wifi.aware.PeerHandle, java.lang.String);
method public void destroy();
method public void sendMessage(android.net.wifi.aware.PeerHandle, int, byte[]);
}
@@ -26952,8 +26952,8 @@ package android.net.wifi.aware {
}
public class WifiAwareSession {
method public java.lang.String createNetworkSpecifierOpen(int, byte[]);
method public java.lang.String createNetworkSpecifierPassphrase(int, byte[], java.lang.String);
method public android.net.NetworkSpecifier createNetworkSpecifierOpen(int, byte[]);
method public android.net.NetworkSpecifier createNetworkSpecifierPassphrase(int, byte[], java.lang.String);
method public void destroy();
method public void publish(android.net.wifi.aware.PublishConfig, android.net.wifi.aware.DiscoverySessionCallback, android.os.Handler);
method public void subscribe(android.net.wifi.aware.SubscribeConfig, android.net.wifi.aware.DiscoverySessionCallback, android.os.Handler);