diff options
| author | wangqi <wangqi@google.com> | 2017-06-20 11:23:41 -0700 |
|---|---|---|
| committer | Eric Erfanian <erfanian@google.com> | 2017-06-21 18:16:03 +0000 |
| commit | 5b4becb8ca9cc6249d0cf0a074bf63d6999f3b5e (patch) | |
| tree | 9ced1a3f07598cfb65cc3226368ba5321ee10107 /java/com/android/contacts | |
| parent | f0a8ccfcd370d26b3887fc8428dedf5596f42ca8 (diff) | |
Automated g4 rollback of changelist 158923709.
*** Reason for rollback ***
It's not necessary anymore after we verified it could be controlled from server side.
*** Original change description ***
Flip flag to enable ReturnToCall bubble.
Enables ReturnToCall bubble and changes the name of the flag so that it can be toggled independently from previous versions.
***
Also in the change: Restore TODOs
Test: TH
PiperOrigin-RevId: 159587541
Change-Id: I88f01550f07a7859f41b4f0fc843e92b38f5a85b
Diffstat (limited to 'java/com/android/contacts')
3 files changed, 5 insertions, 5 deletions
diff --git a/java/com/android/contacts/common/compat/TelephonyManagerCompat.java b/java/com/android/contacts/common/compat/TelephonyManagerCompat.java index 02113ca55..b428908cd 100644 --- a/java/com/android/contacts/common/compat/TelephonyManagerCompat.java +++ b/java/com/android/contacts/common/compat/TelephonyManagerCompat.java @@ -32,7 +32,7 @@ import java.lang.reflect.InvocationTargetException; public class TelephonyManagerCompat { - // TODO: Use public API for these constants when available + // TODO(maxwelb): Use public API for these constants when available public static final String EVENT_HANDOVER_VIDEO_FROM_WIFI_TO_LTE = "android.telephony.event.EVENT_HANDOVER_VIDEO_FROM_WIFI_TO_LTE"; public static final String EVENT_HANDOVER_TO_WIFI_FAILED = @@ -120,7 +120,7 @@ public class TelephonyManagerCompat { } /** - * This method uses a new system API to enable or disable visual voicemail. TODO: restrict + * This method uses a new system API to enable or disable visual voicemail. TODO(twyen): restrict * to N MR1, not needed in future SDK. */ public static void setVisualVoicemailEnabled( @@ -138,7 +138,7 @@ public class TelephonyManagerCompat { } /** - * This method uses a new system API to check if visual voicemail is enabled TODO: restrict + * This method uses a new system API to check if visual voicemail is enabled TODO(twyen): restrict * to N MR1, not needed in future SDK. */ public static boolean isVisualVoicemailEnabled( diff --git a/java/com/android/contacts/common/compat/telecom/TelecomManagerCompat.java b/java/com/android/contacts/common/compat/telecom/TelecomManagerCompat.java index 8393b2601..e6f424788 100644 --- a/java/com/android/contacts/common/compat/telecom/TelecomManagerCompat.java +++ b/java/com/android/contacts/common/compat/telecom/TelecomManagerCompat.java @@ -23,7 +23,7 @@ import java.lang.reflect.Field; /** Compatibility class for {@link android.telecom.TelecomManager}. */ public class TelecomManagerCompat { - // TODO: remove once this is available in android.telecom.Call + // TODO(mdooley): remove once this is available in android.telecom.Call // b/33779976 public static final String EXTRA_LAST_EMERGENCY_CALLBACK_TIME_MILLIS = "android.telecom.extra.LAST_EMERGENCY_CALLBACK_TIME_MILLIS"; diff --git a/java/com/android/contacts/common/list/PhoneNumberPickerFragment.java b/java/com/android/contacts/common/list/PhoneNumberPickerFragment.java index de7903e83..558f3b209 100644 --- a/java/com/android/contacts/common/list/PhoneNumberPickerFragment.java +++ b/java/com/android/contacts/common/list/PhoneNumberPickerFragment.java @@ -278,7 +278,7 @@ public class PhoneNumberPickerFragment extends ContactEntryListFragment<ContactE @MainThread public void onLoadFinished(Loader<Cursor> loader, Cursor data) { Assert.isMainThread(); - // TODO: define and verify behavior for "Nearby places", corp directories, + // TODO(strongarm): define and verify behavior for "Nearby places", corp directories, // and dividers listed in UI between these categories if (mCursorReranker != null && data != null |