commit efdfdb1ff2d1916c5fcc20041e6786e95f563f84
author Pankaj Kanwar <pkanwar@google.com> Thu Feb 16 18:23:28 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Feb 16 18:23:28 2017 +0000
tree 5db3551433359ba30418983de0a8f55fb1c7ee31
parent 9bed370a3752e76ddb983f8b1aa99b01d8ca0e79
parent b2dec97ca92950c53544e8bb970f6b4e80048568

Merge "Specify the task affinity for ToneDialog" am: 7bd1850ed7 am: f48692da57
am: b2dec97ca9

Change-Id: I0dcf88e93350f2f19676fbab84313e6a4b768f18

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index e85cbca..1beb3ae 100755
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -96,7 +96,8 @@
 
         <activity android:name="ToneDialog"
             android:exported="false"
-            android:theme="@android:style/Theme.DeviceDefault.Dialog">
+            android:theme="@android:style/Theme.DeviceDefault.Dialog"
+            android:taskAffinity="android.task.stk.StkLauncherActivity">
         </activity>
 
         <receiver android:name="com.android.stk.StkCmdReceiver">