Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9ace6a9a authored by Anton Hansson's avatar Anton Hansson Committed by Automerger Merge Worker
Browse files

Merge "Add wifi util lib to classpath for wifi stubs" into rvc-dev am:... 

Merge "Add wifi util lib to classpath for wifi stubs" into rvc-dev am: b51f33f4 am: 1f30cd97 am: bd96e041

Change-Id: Ifac17e677cd6c90f64706f3bfe72a8f77f2cbd12
parents 77b5ed61 bd96e041

wifi/Android.bp

+4 −1
Original line number Diff line number Diff line
@@ -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",

}

wifi/api/system-current.txt

+10 −10
Original line number Diff line number Diff line
@@ -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