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

Merge "[AWARE] Remove enableUsage/disableUsage API"

Browse Source
This commit is contained in:
Etan Cohen
2017-02-17 21:33:39 +00:00
committed by Gerrit Code Review
parent 17532ec02e 416d6fba17
commit 647f2e1493
3 changed files with 0 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
wifi/java/android/net/wifi/aware/IWifiAwareManager.aidl
View File

@@ -34,8 +34,6 @@ import android.net.wifi.RttManager;
interface IWifiAwareManager interface IWifiAwareManager
{ {
// Aware API // Aware API
void enableUsage();
void disableUsage();
boolean isUsageEnabled(); boolean isUsageEnabled();
Characteristics getCharacteristics(); Characteristics getCharacteristics();

30
wifi/java/android/net/wifi/aware/WifiAwareManager.java
View File

@@ -252,36 +252,6 @@ public class WifiAwareManager {
mService = service; mService = service;
} }
/**
* Enable the usage of the Aware API. Doesn't actually turn on Aware cluster formation - that
* only happens when an attach is attempted. {@link #ACTION_WIFI_AWARE_STATE_CHANGED} broadcast
* will be triggered.
*
* @hide
*/
public void enableUsage() {
try {
mService.enableUsage();
} catch (RemoteException e) {
throw e.rethrowFromSystemServer();
}
}
/**
* Disable the usage of the Aware API. All attempts to attach() will be rejected. All open
* connections and sessions will be terminated. {@link #ACTION_WIFI_AWARE_STATE_CHANGED}
* broadcast will be triggered.
*
* @hide
*/
public void disableUsage() {
try {
mService.disableUsage();
} catch (RemoteException e) {
throw e.rethrowFromSystemServer();
}
}
/** /**
* Returns the current status of Aware API: whether or not Aware is available. To track * Returns the current status of Aware API: whether or not Aware is available. To track
* changes in the state of Aware API register for the * changes in the state of Aware API register for the

20
wifi/tests/src/android/net/wifi/aware/WifiAwareManagerTest.java
View File

@@ -99,26 +99,6 @@ public class WifiAwareManagerTest {
* Straight pass-through tests * Straight pass-through tests
*/ */
/**
* Validate pass-through of enableUsage() API.
*/
@Test
public void testEnableUsage() throws Exception {
mDut.enableUsage();
verify(mockAwareService).enableUsage();
}
/**
* Validate pass-through of disableUsage() API.
*/
@Test
public void testDisableUsage() throws Exception {
mDut.disableUsage();
verify(mockAwareService).disableUsage();
}
/** /**
* Validate pass-through of isUsageEnabled() API. * Validate pass-through of isUsageEnabled() API.
*/ */