commit 903d2610dd6479445633db86336bde3208e5b4da
author Youming Ye <paulye@google.com> Thu Aug 30 22:03:06 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Aug 30 22:03:06 2018 +0000
tree 1013713e77ef14fee7fd0d36d410897deebf192f
parent a544f17b9923a015e23ff70bbbe0fac18f30bddf
parent 4f6e4bfa4f5c899ef9fda6dfa772537adb110b8a

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

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 98004f1..7a3ae95 100644
--- 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" />