commit 539eaa34d597836f43d17b07eb7d719da5fd6587
author Stephen Chen <stewchen@google.com> Wed Nov 30 23:59:43 2016 +0000
committer android-build-merger <android-build-merger@google.com> Wed Nov 30 23:59:43 2016 +0000
tree cb51f285ffc98acc61a847d1525289625d309a46
parent 001632d55c41a76088ac6417fd1098cb883b5c56
parent 666c9d7ea574a722a6e59d2a4397c2c6a7939085

Merge "Link WIFI_SAVED_NETWORK_SETTINGS action with activity."
am: 666c9d7ea5

Change-Id: I1b193660453cbc492d83501f8e9fe3b544e6e4b2

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 8481bae..23cd219 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -317,7 +317,7 @@
                 android:configChanges="orientation|keyboardHidden|screenSize"
                 android:parentActivityName="Settings$WifiSettingsActivity">
             <intent-filter android:priority="1">
-                <action android:name="android.settings.WIFI_IF_SETTINGS" />
+                <action android:name="android.settings.WIFI_SAVED_NETWORK_SETTINGS" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
             <intent-filter>
@@ -325,7 +325,7 @@
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
-                android:value="com.android.settings.wifi.SavedAccessPointsSettings" />
+                android:value="com.android.settings.wifi.SavedAccessPointsWifiSettings" />
             <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
                 android:value="true" />
         </activity>