diff options
| author | Nancy Chen <nancychen@google.com> | 2015-12-22 14:36:47 -0800 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-12-22 14:36:47 -0800 |
| commit | f5f0f5fe5ed0394f5f495f1b93cfab1042d32c5a (patch) | |
| tree | 46e748fcc7c31783815c4e5e752de685681a9489 /InCallUI | |
| parent | 936abdbe3cbd8a4761357322e744ac55eeaf0cdb (diff) | |
| parent | 898b046bd6aa1ffdd5ef602f4dfdd55c74c2bbd7 (diff) | |
Merge "Use some Call.Details methods available in L-Mr1." into ub-contactsdialer-b-dev
am: d2d83a7203
* commit 'd2d83a72033b1029d9c33c655d73a27bb97648fa':
Use some Call.Details methods available in L-Mr1.
Diffstat (limited to 'InCallUI')
| -rw-r--r-- | InCallUI/src/com/android/incallui/compat/telecom/DetailsCompat.java | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/InCallUI/src/com/android/incallui/compat/telecom/DetailsCompat.java b/InCallUI/src/com/android/incallui/compat/telecom/DetailsCompat.java index c82a972a7..b9f82a9f1 100644 --- a/InCallUI/src/com/android/incallui/compat/telecom/DetailsCompat.java +++ b/InCallUI/src/com/android/incallui/compat/telecom/DetailsCompat.java @@ -19,7 +19,7 @@ import android.os.Build; import android.os.Bundle; import android.telecom.Call.Details; -import com.android.contacts.common.compat.SdkVersionOverride; +import com.android.contacts.common.compat.CompatUtils; import com.android.incallui.Log; /** @@ -41,7 +41,7 @@ public class DetailsCompat { * @return The given details' intent extras */ public static Bundle getIntentExtras(Details details) { - if (SdkVersionOverride.getSdkVersion(Build.VERSION_CODES.M) >= Build.VERSION_CODES.M) { + if (CompatUtils.isMarshmallowCompatible()) { return details.getIntentExtras(); } return details.getExtras(); @@ -56,7 +56,7 @@ public class DetailsCompat { * @return Whether the specified property is supported. */ public static boolean hasProperty(Details details, int property) { - if (SdkVersionOverride.getSdkVersion(Build.VERSION_CODES.M) >= Build.VERSION_CODES.M) { + if (CompatUtils.isMarshmallowCompatible()) { return details.hasProperty(property); } return (details.getCallProperties() & property) != 0; @@ -71,7 +71,7 @@ public class DetailsCompat { * @return Whether the specified capability is supported. */ public static boolean can(Details details, int capability) { - if (SdkVersionOverride.getSdkVersion(Build.VERSION_CODES.M) >= Build.VERSION_CODES.M) { + if (CompatUtils.isLollipopMr1Compatible()) { return details.can(capability); } return (details.getCallCapabilities() & capability) != 0; @@ -84,7 +84,7 @@ public class DetailsCompat { * @return A human readable string representation. */ public static String capabilitiesToString(int capabilities) { - if (SdkVersionOverride.getSdkVersion(Build.VERSION_CODES.M) >= Build.VERSION_CODES.M) { + if (CompatUtils.isLollipopMr1Compatible()) { return Details.capabilitiesToString(capabilities); } return capabilitiesToStringLollipop(capabilities); |