From e739b3c99bdf2c2baad3b142c0f271568c4e8556 Mon Sep 17 00:00:00 2001
From: Weng Su <wengsu@google.com>
Date: Mon, 25 Oct 2021 11:24:01 +0800
Subject: [PATCH] Keep compatibility for old WiFi shortcut

- WifiSettings2Activity has been replaced by WifiSettingsActivity

Test: Create a shortcut to WifiSettings in R, update to S and test it
Bug: 199033769
Change-Id: I735106578cd11a15ffef1fd4d8e9703ae781db6c
Merged-In: Idb08b9650e7c5efce4ab40eb949ccab0e5949333
---
 AndroidManifest.xml | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 8fedf92b345..a29089a8498 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -298,6 +298,17 @@
                 android:value="true" />
         </activity>
 
+        <!-- Keep compatibility with old shortcuts. -->
+        <activity-alias
+            android:name="Settings$WifiSettings2Activity"
+            android:targetActivity="Settings$WifiSettingsActivity"
+            android:label="@string/wifi_settings"
+            android:icon="@drawable/ic_homepage_network"
+            android:exported="true">
+            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
+                       android:value="com.android.settings.wifi.WifiSettings" />
+        </activity-alias>
+
         <activity
             android:name="Settings$NetworkProviderSettingsActivity"
             android:label="@string/provider_internet_settings"