From 5edcc30ada3070890288512c99c60b8114d4ef00 Mon Sep 17 00:00:00 2001
From: Yanting Yang <yantingyang@google.com>
Date: Thu, 5 Sep 2019 16:25:17 +0800
Subject: [PATCH] Fix upper back button behavior of LocationSettingsActivity

In acrossing different apps, it should go back to previous app if user
click the upper back button on LocationSettingsActivity. So remove the
android:parentActivityName attribute of LocationSettingsActivity from
AndroidManifest.

Fixes: 140370314
Test: visual
Change-Id: I1efa750f1371a313c83844a67862d903cfe65bf6
---
 AndroidManifest.xml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 13eed78900a..ef5facf6720 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1228,8 +1228,7 @@
             android:name="Settings$LocationSettingsActivity"
             android:label="@string/location_settings_title"
             android:icon="@drawable/ic_homepage_location"
-            android:configChanges="orientation|keyboardHidden|screenSize"
-            android:parentActivityName="Settings">
+            android:configChanges="orientation|keyboardHidden|screenSize">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.LOCATION_SOURCE_SETTINGS" />
                 <category android:name="android.intent.category.DEFAULT" />