diff options
author | Treehugger Robot <treehugger-gerrit@google.com> | 2018-04-04 01:43:18 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-04-04 01:43:18 +0000 |
commit | d5408c9423f20bef650ca838ff66bb5ecf60f818 (patch) | |
tree | d71a3bf4606c11bcf0ce9f2dc2266b5533561c0b /java/com/android/dialer/constants/ActivityRequestCodes.java | |
parent | c81fbd75f18621d7ce68c8df65cc468efe6ffe23 (diff) | |
parent | 01b782754418aa17dbb867591642b49e473e92b1 (diff) |
Merge changes I28244a72,Ic984f958,I5dc2bed7,I1be427b3,I0220a342, ...
* changes:
Remove reference to RTT system setting.
Fix the button style of RTT request dialog.
Don't deadlock in DialerDatabaseHelper.
Fix NPE for details number
Per linguists' request, increase CHAR_LIMIT of "Carrier video" from 30 to 31.
Fix permission
Handle missed calls for new call log in old peer.
Separate calls with the video feature from others when coalescing rows in the new call log.
Support placing Duo calls in the new UI's bottom sheet.
Turn off component generating step of RootComponentGenerato and @DialerCompoennt. Delete related tests.
Implement dialog for responding RTT request.
Diffstat (limited to 'java/com/android/dialer/constants/ActivityRequestCodes.java')
-rw-r--r-- | java/com/android/dialer/constants/ActivityRequestCodes.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/java/com/android/dialer/constants/ActivityRequestCodes.java b/java/com/android/dialer/constants/ActivityRequestCodes.java index 66c38fa64..7fd619ba9 100644 --- a/java/com/android/dialer/constants/ActivityRequestCodes.java +++ b/java/com/android/dialer/constants/ActivityRequestCodes.java @@ -16,8 +16,6 @@ package com.android.dialer.constants; -import com.android.dialer.duo.Duo; - /** * Class containing {@link android.app.Activity#onActivityResult(int, int, android.content.Intent)} * request codes. @@ -32,7 +30,9 @@ public final class ActivityRequestCodes { /** Request code for {@link com.android.dialer.callcomposer.CallComposerActivity} intent. */ public static final int DIALTACTS_CALL_COMPOSER = 2; - /** Request code for {@link Duo#getIntent(android.content.Context, String)}. */ + /** + * Request code for {@link com.android.dialer.duo.Duo#getIntent(android.content.Context, String)}. + */ public static final int DIALTACTS_DUO = 3; /** Request code for {@link com.android.dialer.calldetails.OldCallDetailsActivity} intent. */ |