diff options
| author | Tony Mak <tonymak@google.com> | 2016-05-20 16:55:29 +0100 |
|---|---|---|
| committer | Tony Mak <tonymak@google.com> | 2016-05-20 16:55:29 +0100 |
| commit | db10dcab7fdf819cc0da1c522512c5e9d66a50de (patch) | |
| tree | 5190d06232023e8c9d53c90414bf6656af605a3d | |
| parent | ccd36d21154ce0864dfaa4ad78a2331bda316d03 (diff) | |
| parent | 35b885b0d1cdaaac9684b9b77aa53b926f06c37e (diff) | |
| download | packages_apps_ContactsCommon-db10dcab7fdf819cc0da1c522512c5e9d66a50de.tar.gz packages_apps_ContactsCommon-db10dcab7fdf819cc0da1c522512c5e9d66a50de.tar.bz2 packages_apps_ContactsCommon-db10dcab7fdf819cc0da1c522512c5e9d66a50de.zip | |
Merge commit '35b885b0d1cdaaac9684b9b77aa53b926f06c37e' into manual_merge_35b885b
Change-Id: I525d140f84a631c7dde0569397c7a8ad441027f5
| -rw-r--r-- | src-N/com/android/contacts/common/compat/CallSdkCompat.java | 2 | ||||
| -rw-r--r-- | src-pre-N/com/android/contacts/common/compat/CallSdkCompat.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src-N/com/android/contacts/common/compat/CallSdkCompat.java b/src-N/com/android/contacts/common/compat/CallSdkCompat.java index 4eea8237..650e09c7 100644 --- a/src-N/com/android/contacts/common/compat/CallSdkCompat.java +++ b/src-N/com/android/contacts/common/compat/CallSdkCompat.java @@ -21,7 +21,7 @@ import android.telecom.Call; public class CallSdkCompat { public static class Details { public static final int PROPERTY_IS_EXTERNAL_CALL = Call.Details.PROPERTY_IS_EXTERNAL_CALL; - public static final int PROPERTY_WORK_CALL = Call.Details.PROPERTY_WORK_CALL; + public static final int PROPERTY_ENTERPRISE_CALL = Call.Details.PROPERTY_ENTERPRISE_CALL; public static final int CAPABILITY_CAN_PULL_CALL = Call.Details.CAPABILITY_CAN_PULL_CALL; public static final int CAPABILITY_CANNOT_DOWNGRADE_VIDEO_TO_AUDIO = Call.Details.CAPABILITY_CANNOT_DOWNGRADE_VIDEO_TO_AUDIO; diff --git a/src-pre-N/com/android/contacts/common/compat/CallSdkCompat.java b/src-pre-N/com/android/contacts/common/compat/CallSdkCompat.java index bbbfa40d..853557c0 100644 --- a/src-pre-N/com/android/contacts/common/compat/CallSdkCompat.java +++ b/src-pre-N/com/android/contacts/common/compat/CallSdkCompat.java @@ -19,7 +19,7 @@ package com.android.contacts.common.compat; public class CallSdkCompat { public static class Details { public static final int PROPERTY_IS_EXTERNAL_CALL = 0x00000040; - public static final int PROPERTY_WORK_CALL = 0x00000020; + public static final int PROPERTY_ENTERPRISE_CALL = 0x00000020; public static final int CAPABILITY_CAN_PULL_CALL = 0x00800000; public static final int CAPABILITY_CANNOT_DOWNGRADE_VIDEO_TO_AUDIO = 0x00400000; } |