From 7457ef708e5a83657dd5db0d98acba9726e909e4 Mon Sep 17 00:00:00 2001
From: Brandon Maxwell <maxwelb@google.com>
Date: Mon, 26 Sep 2016 12:37:29 -0700
Subject: Fixing regression in AOSP CallDetails

A regression was introduced which caused the back arrow in the AOSP
CallDetailsActivity to not work properly.

This CL merges an external contribution (http://pagit/626605) that
fixes the issue by setting the parentActivityName appropriately.

Bug:30004436
Change-Id: I238ff71f3f7e618d5adc972c50012b13f3753f40
---
 AndroidManifest.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index babd271a1..6528fdb4a 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -171,6 +171,7 @@
         <activity android:name="com.android.dialer.CallDetailActivity"
             android:label="@string/callDetailTitle"
             android:theme="@style/CallDetailActivityTheme"
+            android:parentActivityName="com.android.dialer.calllog.CallLogActivity"
             android:icon="@mipmap/ic_launcher_phone">
             <intent-filter>
                 <action android:name="android.intent.action.VIEW"/>
-- 
cgit v1.2.3