From 8614058fbde7ae58b3f45524d912ceb77be3eb17 Mon Sep 17 00:00:00 2001
From: Sunny Shao <sunnyshao@google.com>
Date: Fri, 22 Mar 2019 15:22:36 +0800
Subject: [PATCH] Handle navigation back problem from About Phone

Removed the android:parentActivityName attribute in .Settings$MyDeviceInfoActivity.

Fixes: 128941539
Test: manual test & view
Change-Id: Id5929bd8bcd8b136610fff76e406f62b2ffef8c2
---
 AndroidManifest.xml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 92a106682c1..831846eda4c 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -901,8 +901,7 @@
 
         <activity android:name=".Settings$MyDeviceInfoActivity"
                   android:label="@string/about_settings"
-                  android:icon="@drawable/ic_homepage_about"
-                  android:parentActivityName="Settings">
+                  android:icon="@drawable/ic_homepage_about">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.DEVICE_INFO_SETTINGS" />
                 <action android:name="android.settings.DEVICE_NAME" />