commit cdd5858e481fb0087c40c5997a9fa1446b326165
author Wenchao Tong <tongwenchao@google.com> Wed Jun 18 12:59:21 2014 -0700
committer Chelsea Derrick <chelsead@google.com> Wed Jul 16 22:16:56 2014 +0000
tree 77431671b1cca6c916fcf903461e1d30795741e6
parent a51cab9288fea0a8c8ce9a4ccdb834a11984b32c

Changes in framework for WIFI_CREDENTIAL_CHANGE broadcast. [DO NOT MERGE]

* Only allow system app to send/receive
  WIFI_CREDENTIAL_CHANGE.
* Define constants in WifiManager.

Bug: 15703353
Change-Id: I4bcc6bc82ec01952500eef3965cf81116bba693d
(cherry picked from commit f4a43f196e1132968a8add60efa4ae4558f8b010)

core/res/AndroidManifest.xml

diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml
index 350660b..a7dba66 100644
--- a/core/res/AndroidManifest.xml
+++ b/core/res/AndroidManifest.xml
@@ -235,6 +235,7 @@
     <protected-broadcast android:name="com.android.server.WifiManager.action.DELAYED_DRIVER_STOP" />
     <protected-broadcast android:name="android.net.wifi.WIFI_STATE_CHANGED" />
     <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.SCAN_RESULTS" />
     <protected-broadcast android:name="android.net.wifi.RSSI_CHANGED" />
@@ -805,6 +806,19 @@
         android:description="@string/permdesc_changeWifiState"
         android:label="@string/permlab_changeWifiState" />
 
+    <!-- @SystemApi @hide Allows applications to read Wi-Fi credential.
+         <p>Not for use by third-party applications. -->
+    <permission android:name="android.permission.READ_WIFI_CREDENTIAL"
+        android:permissionGroup="android.permission-group.NETWORK"
+        android:protectionLevel="signature|system" />
+
+    <!-- @SystemApi @hide Allow system apps to receive broadcast
+         when a wifi network credential is changed.
+         <p>Not for use by third-party applications. -->
+    <permission android:name="android.permission.RECEIVE_WIFI_CREDENTIAL_CHANGE"
+        android:permissionGroup="android.permission-group.NETWORK"
+        android:protectionLevel="signature|system" />
+
     <!-- @hide -->
     <permission android:name="android.permission.ACCESS_WIMAX_STATE"
         android:permissionGroup="android.permission-group.NETWORK"