Move android.settings.WIFI_SETTINGS action to Internet Settings
- Starting from S, the WiFi Settings is changed to Internet Settings
- Redirect to WiFi Settings if Provider Model disabled
- Don't use FLAG_ACTIVITY_NEW_TASK to avoid Lock Task Mode impacted
Bug: 199364761
Bug: 198740257
Bug: 203191404
Test: manual verified by TestDPC apk (see b/198740257#comment41)
Change-Id: I3c283ef58b37f4d3fe27045f431932a35af55023
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 7199dd5..8fedf92 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -292,10 +292,6 @@
android:icon="@drawable/ic_homepage_network"
android:exported="true"
android:configChanges="orientation|keyboardHidden|screenSize">
- <intent-filter android:priority="1">
- <action android:name="android.settings.WIFI_SETTINGS" />
- <category android:name="android.intent.category.DEFAULT" />
- </intent-filter>
<meta-data android:name="com.android.settings.FRAGMENT_CLASS"
android:value="com.android.settings.wifi.WifiSettings" />
<meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
@@ -313,6 +309,10 @@
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
<intent-filter android:priority="1">
+ <action android:name="android.settings.WIFI_SETTINGS" />
+ <category android:name="android.intent.category.DEFAULT" />
+ </intent-filter>
+ <intent-filter android:priority="1">
<action android:name="android.intent.action.MAIN" />
<category android:name="com.android.settings.SHORTCUT" />
</intent-filter>