diff options
| author | 2020-03-31 18:45:22 +0000 | |
|---|---|---|
| committer | 2020-03-31 18:45:22 +0000 | |
| commit | b51f33f4cde98b8b278e778daa6c4eeeae865614 (patch) | |
| tree | a31046c0860acf4be1d9c2eae4c2d707952f5b0e | |
| parent | 7ca55ee7f60bfccd61a40203d74b762c408d3ad9 (diff) | |
| parent | 2e53a5302bcb1742638ec45259105d0ec6b5cb5b (diff) | |
Merge "Add wifi util lib to classpath for wifi stubs" into rvc-dev
| -rw-r--r-- | wifi/Android.bp | 5 | ||||
| -rw-r--r-- | wifi/api/system-current.txt | 20 |
2 files changed, 14 insertions, 11 deletions
diff --git a/wifi/Android.bp b/wifi/Android.bp index 614786193a18..c0a5e199cfb8 100644 --- a/wifi/Android.bp +++ b/wifi/Android.bp @@ -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", } diff --git a/wifi/api/system-current.txt b/wifi/api/system-current.txt index e39e148ca2b4..07793c1eb02a 100644 --- a/wifi/api/system-current.txt +++ b/wifi/api/system-current.txt @@ -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 |