Merge "Fix the Wifi Calling back button goes to wrong screen"

2018-08-30 22:03:06 +00:00
parent a544f17b99 4f6e4bfa4f
commit 903d2610dd
1 changed files with 1 additions and 2 deletions
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -2882,8 +2882,7 @@
        <activity
            android:name="Settings$WifiCallingSettingsActivity"
            android:label="@string/wifi_calling_settings_title"
-            android:taskAffinity="com.android.settings"
-            android:parentActivityName="Settings">
+            android:taskAffinity="com.android.settings">
            <intent-filter>
                <action android:name="android.intent.action.MAIN" />
                <action android:name="android.settings.WIFI_CALLING_SETTINGS" />