diff options
| author | 2016-09-30 20:45:02 +0000 | |
|---|---|---|
| committer | 2016-09-30 20:45:02 +0000 | |
| commit | e3d5fa1094ecc9edd1c71b002ca4436d327c42eb (patch) | |
| tree | f96f5b0c96f06ee5d6c5dccb715aadcfc7011e40 | |
| parent | 42d25b5992c6c5967ca7d82001bc0e415f2887a6 (diff) | |
| parent | 720d175757f30ff7546309031a8e60f71f5387ee (diff) | |
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
| -rw-r--r-- | core/res/AndroidManifest.xml | 1 | ||||
| -rw-r--r-- | wifi/java/android/net/wifi/nan/WifiNanManager.java | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml index b0b57d909174..ae560f9f8779 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -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" /> diff --git a/wifi/java/android/net/wifi/nan/WifiNanManager.java b/wifi/java/android/net/wifi/nan/WifiNanManager.java index 705ba4a5a4bd..bb1543418c6d 100644 --- a/wifi/java/android/net/wifi/nan/WifiNanManager.java +++ b/wifi/java/android/net/wifi/nan/WifiNanManager.java @@ -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 = |