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

Commit e3d5fa10 authored by Etan Cohen's avatar Etan Cohen Committed by Gerrit Code Review
Browse files

Merge changes from topic 'cherry-pick' 

* changes:
  [NAN] Register WIFI_NAN_STATE_CHANGED as protected broadcast
  [NAN] Update API javadoc to clarify NAN status change broadcast scope
parents 42d25b59 720d1757

core/res/AndroidManifest.xml

+1 −0
Original line number Diff line number Diff line
@@ -289,6 +289,7 @@ 
    <protected-broadcast android:name="android.net.wifi.WIFI_AP_STATE_CHANGED" />

    <protected-broadcast android:name="android.net.wifi.WIFI_CREDENTIAL_CHANGED" />

    <protected-broadcast android:name="android.net.wifi.WIFI_SCAN_AVAILABLE" />

    <protected-broadcast android:name="android.net.wifi.nan.action.WIFI_NAN_STATE_CHANGED" />

    <protected-broadcast android:name="android.net.wifi.SCAN_RESULTS" />

    <protected-broadcast android:name="android.net.wifi.RSSI_CHANGED" />

    <protected-broadcast android:name="android.net.wifi.STATE_CHANGE" />

wifi/java/android/net/wifi/nan/WifiNanManager.java

+2 −0
Original line number Diff line number Diff line
@@ -201,6 +201,8 @@ public class WifiNanManager { 
     * Use the {@link #isAvailable()} to query the current status.

     * This broadcast is <b>not</b> sticky, use the {@link #isAvailable()} API after registering

     * the broadcast to check the current state of Wi-Fi NAN.

     * <p>Note: The broadcast is only delivered to registered receivers - no manifest registered

     * components will be launched.

     */

    @SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)

    public static final String ACTION_WIFI_NAN_STATE_CHANGED =