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

Merge "Merge "Add wifi util lib to classpath for wifi stubs" into rvc-dev am: b51f33f4cd am: 1f30cd976c" into rvc-d1-dev-plus-aosp am: cd6e0712c4

Browse Source 
Change-Id: I3ca2f8b0add0ea862a81c8c9b300a460cd028e08
This commit is contained in:
Automerger Merge Worker
2020-03-31 20:13:54 +00:00
parent 319a31de53 cd6e0712c4
commit 67cf6e2e8a
2 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
wifi/Android.bp
View File

@@ -130,7 +130,10 @@ stubs_defaults {
":framework-wifi-updatable-sources",
":framework-wifi-util-lib-aidls",
],
libs: [ "framework-annotations-lib" ],
libs: [
"framework-annotations-lib",
"framework-wifi-util-lib",
],
sdk_version: "module_current",
}

20
wifi/api/system-current.txt
View File

@@ -23,16 +23,16 @@ package android.net.wifi {
method @Deprecated @RequiresPermission(android.Manifest.permission.LOCATION_HARDWARE) public android.net.wifi.RttManager.RttCapabilities getRttCapabilities();
method @Deprecated @RequiresPermission(android.Manifest.permission.LOCATION_HARDWARE) public void startRanging(android.net.wifi.RttManager.RttParams[], android.net.wifi.RttManager.RttListener);
method @Deprecated @RequiresPermission(android.Manifest.permission.LOCATION_HARDWARE) public void stopRanging(android.net.wifi.RttManager.RttListener);
field @Deprecated public static final int BASE;
field @Deprecated public static final int CMD_OP_ABORTED;
field @Deprecated public static final int CMD_OP_DISABLE_RESPONDER;
field @Deprecated public static final int CMD_OP_ENABLE_RESPONDER;
field @Deprecated public static final int CMD_OP_ENALBE_RESPONDER_FAILED;
field @Deprecated public static final int CMD_OP_ENALBE_RESPONDER_SUCCEEDED;
field @Deprecated public static final int CMD_OP_FAILED;
field @Deprecated public static final int CMD_OP_START_RANGING;
field @Deprecated public static final int CMD_OP_STOP_RANGING;
field @Deprecated public static final int CMD_OP_SUCCEEDED;
field @Deprecated public static final int BASE = 160256; // 0x27200
field @Deprecated public static final int CMD_OP_ABORTED = 160260; // 0x27204
field @Deprecated public static final int CMD_OP_DISABLE_RESPONDER = 160262; // 0x27206
field @Deprecated public static final int CMD_OP_ENABLE_RESPONDER = 160261; // 0x27205
field @Deprecated public static final int CMD_OP_ENALBE_RESPONDER_FAILED = 160264; // 0x27208
field @Deprecated public static final int CMD_OP_ENALBE_RESPONDER_SUCCEEDED = 160263; // 0x27207
field @Deprecated public static final int CMD_OP_FAILED = 160258; // 0x27202
field @Deprecated public static final int CMD_OP_START_RANGING = 160256; // 0x27200
field @Deprecated public static final int CMD_OP_STOP_RANGING = 160257; // 0x27201
field @Deprecated public static final int CMD_OP_SUCCEEDED = 160259; // 0x27203
field @Deprecated public static final String DESCRIPTION_KEY = "android.net.wifi.RttManager.Description";
field @Deprecated public static final int PREAMBLE_HT = 2; // 0x2
field @Deprecated public static final int PREAMBLE_LEGACY = 1; // 0x1