diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2018-06-12 22:34:27 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-06-12 22:34:27 +0000 |
| commit | 46e2cd8eb8ee79a6e7078277f29ee8a6eaf422cd (patch) | |
| tree | 7d469bc795cfde57f6c273949509e3e6627a729d /java | |
| parent | e698891deb8167873b35f1af19184c0ed4cc6549 (diff) | |
| parent | da72fe53822941b7337506151ca2b7ba2ef39aa5 (diff) | |
Merge "Replaced a reference in a comment to DialtactsActivity with MainActivity."
Diffstat (limited to 'java')
| -rw-r--r-- | java/com/android/incallui/AndroidManifest.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/java/com/android/incallui/AndroidManifest.xml b/java/com/android/incallui/AndroidManifest.xml index 7091d6038..4cb600190 100644 --- a/java/com/android/incallui/AndroidManifest.xml +++ b/java/com/android/incallui/AndroidManifest.xml @@ -47,7 +47,7 @@ <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/> <!-- Set android:taskAffinity="com.android.incallui" for all activities to ensure proper - navigation. Otherwise system could bring up DialtactsActivity instead, e.g. when user unmerge a + navigation. Otherwise system could bring up MainActivity instead, e.g. when user unmerge a call. Set taskAffinity for application is not working because it will be merged and the result is that all activities here still have same taskAffinity as activities under dialer. --> |