commit 4f6e4bfa4f5c899ef9fda6dfa772537adb110b8a
author Youming Ye <paulye@google.com> Wed Aug 29 18:20:22 2018 -0700
committer Youming Ye <paulye@google.com> Wed Aug 29 18:28:01 2018 -0700
tree 9d9d0ce24d4f25e2f19991cacd814814e9751974
parent 0c724f5181747a9ae08eea25ab406da808ee365e

Fix the Wifi Calling back button goes to wrong screen

The Wifi Calling activitis had Settings as it's parent activity.
Remove the parent declaration to navigate Wifi Calling screen back
to previous activity or fragment correctly.

Bug: 111818398
Test: Manual
Change-Id: I95168785936aeea0740dbb8e26280eaa8417c015

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 6f80e11..762b2d7 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -2883,8 +2883,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" />