Separate wifi AP added by applications.
-Add field for tracking user approval of application added networks.
-Add WifiConfig fields for creating/updating application name
-Add permission to allow system apps to modify any network
Bug: 16953082
Change-Id: I12943563ef714c4287e13488578f020d136d006d
diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml
index 965f391..1cb7796 100644
--- a/core/res/AndroidManifest.xml
+++ b/core/res/AndroidManifest.xml
@@ -832,6 +832,14 @@
android:permissionGroup="android.permission-group.NETWORK"
android:protectionLevel="signature|system" />
+ <!-- @SystemApi @hide Allows an application to modify any wifi configuration, even if created
+ by another application. Once reconfigured the original creator canot make any further
+ modifications.
+ <p>Not for use by third-party applications. -->
+ <permission android:name="android.permission.OVERRIDE_WIFI_CONFIG"
+ 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"
diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml
index 83b65b2..ed4c021 100644
--- a/core/res/res/values/strings.xml
+++ b/core/res/res/values/strings.xml
@@ -3620,6 +3620,14 @@
<!-- Do not translate. Default access point SSID used for tethering -->
<string name="wifi_tether_configure_ssid_default" translatable="false">AndroidAP</string>
+ <!-- A notification is shown the first time a connection is attempted on an app owned AP -->
+ <!-- title for this message -->
+ <string name="wifi_connect_alert_title">Allow connection?</string>
+ <!-- message explaining who is connecting to what -->
+ <string name="wifi_connect_alert_message">%1$s would like to connect to %2$s</string>
+ <!-- default application in case name can not be found -->
+ <string name="wifi_connect_default_application">An application</string>
+
<string name="wifi_p2p_dialog_title">Wi-Fi Direct</string>
<string name="wifi_p2p_turnon_message">Start Wi-Fi Direct. This will turn off Wi-Fi client/hotspot.</string>
<string name="wifi_p2p_failed_message">Couldn\'t start Wi-Fi Direct.</string>
diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml
index d5e4395..cb8bd6d 100644
--- a/core/res/res/values/symbols.xml
+++ b/core/res/res/values/symbols.xml
@@ -898,6 +898,9 @@
<java-symbol type="string" name="wifi_available_sign_in" />
<java-symbol type="string" name="network_available_sign_in" />
<java-symbol type="string" name="network_available_sign_in_detailed" />
+ <java-symbol type="string" name="wifi_connect_alert_title" />
+ <java-symbol type="string" name="wifi_connect_alert_message" />
+ <java-symbol type="string" name="wifi_connect_default_application" />
<java-symbol type="string" name="wifi_p2p_dialog_title" />
<java-symbol type="string" name="wifi_p2p_enabled_notification_message" />
<java-symbol type="string" name="wifi_p2p_enabled_notification_title" />