From 57fdc2b9ab68bff217d4c9c605ef89cefd66f678 Mon Sep 17 00:00:00 2001 From: calderwoodra Date: Thu, 22 Mar 2018 01:06:19 -0700 Subject: Increase minSdk to 24. Manually set to M - MissedCallNotifierTest (not sure what the issue is here...) - CallLogGroupBuilderTest (because a check was removed, some NPEs are thrown) - MainSearchControllerTest (/system/etc/fonts.xml (No such file or directory)) Ignore Tests - a few random ones in incallui/answer/impl/hint (shared prefs aren't working for some reason) - VisualVoicemailUpdateTaskTest (disabled the whole test, issue unclear) Bug: 73902692 Test: tap PiperOrigin-RevId: 190030202 Change-Id: I1e9b61d758a61582c5a183ee884dd2181d1c10de --- java/com/android/dialer/compat/CompatUtils.java | 13 +++---- .../android/dialer/compat/SdkVersionOverride.java | 43 ---------------------- .../compat/telephony/TelephonyManagerCompat.java | 13 +------ 3 files changed, 7 insertions(+), 62 deletions(-) delete mode 100644 java/com/android/dialer/compat/SdkVersionOverride.java (limited to 'java/com/android/dialer/compat') diff --git a/java/com/android/dialer/compat/CompatUtils.java b/java/com/android/dialer/compat/CompatUtils.java index 584f20549..d09f8b0e1 100644 --- a/java/com/android/dialer/compat/CompatUtils.java +++ b/java/com/android/dialer/compat/CompatUtils.java @@ -16,17 +16,17 @@ package com.android.dialer.compat; import android.content.Context; -import android.os.Build; import android.os.Build.VERSION; import android.os.Build.VERSION_CODES; import android.os.LocaleList; import java.util.Locale; +/** TODO(calderwoodra): documentation */ public final class CompatUtils { /** PrioritizedMimeType is added in API level 23. */ public static boolean hasPrioritizedMimeType() { - return SdkVersionOverride.getSdkVersion(Build.VERSION_CODES.M) >= Build.VERSION_CODES.M; + return true; } /** @@ -36,8 +36,7 @@ public final class CompatUtils { * @return {@code true} if multi-SIM capability is available, {@code false} otherwise. */ public static boolean isMSIMCompatible() { - return SdkVersionOverride.getSdkVersion(Build.VERSION_CODES.LOLLIPOP) - >= Build.VERSION_CODES.LOLLIPOP_MR1; + return true; } /** @@ -47,7 +46,7 @@ public final class CompatUtils { * @return {@code true} if video calling is allowed, {@code false} otherwise. */ public static boolean isVideoCompatible() { - return SdkVersionOverride.getSdkVersion(Build.VERSION_CODES.LOLLIPOP) >= Build.VERSION_CODES.M; + return true; } /** @@ -57,7 +56,7 @@ public final class CompatUtils { * @return {@code true} if video presence checking is allowed, {@code false} otherwise. */ public static boolean isVideoPresenceCompatible() { - return SdkVersionOverride.getSdkVersion(Build.VERSION_CODES.M) > Build.VERSION_CODES.M; + return true; } /** @@ -67,7 +66,7 @@ public final class CompatUtils { * @return {@code true} if call subject is a feature on this device, {@code false} otherwise. */ public static boolean isCallSubjectCompatible() { - return SdkVersionOverride.getSdkVersion(Build.VERSION_CODES.LOLLIPOP) >= Build.VERSION_CODES.M; + return true; } /** Returns locale of the device. */ diff --git a/java/com/android/dialer/compat/SdkVersionOverride.java b/java/com/android/dialer/compat/SdkVersionOverride.java deleted file mode 100644 index 1d253a355..000000000 --- a/java/com/android/dialer/compat/SdkVersionOverride.java +++ /dev/null @@ -1,43 +0,0 @@ -/* - * Copyright (C) 2015 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License - */ - -package com.android.dialer.compat; - -import android.os.Build.VERSION; - -/** - * Class used to override the current sdk version to test specific branches of compatibility logic. - * When such branching occurs, use {@link #getSdkVersion(int)} rather than explicitly calling {@link - * VERSION#SDK_INT}. This allows the sdk version to be forced to a specific value. - */ -public class SdkVersionOverride { - - /** Flag used to determine if override sdk versions are returned. */ - private static final boolean ALLOW_OVERRIDE_VERSION = false; - - private SdkVersionOverride() {} - - /** - * Gets the sdk version - * - * @param overrideVersion the version to attempt using - * @return overrideVersion if the {@link #ALLOW_OVERRIDE_VERSION} flag is set to {@code true}, - * otherwise the current version - */ - public static int getSdkVersion(int overrideVersion) { - return ALLOW_OVERRIDE_VERSION ? overrideVersion : VERSION.SDK_INT; - } -} diff --git a/java/com/android/dialer/compat/telephony/TelephonyManagerCompat.java b/java/com/android/dialer/compat/telephony/TelephonyManagerCompat.java index c4ed6e6ed..655540bba 100644 --- a/java/com/android/dialer/compat/telephony/TelephonyManagerCompat.java +++ b/java/com/android/dialer/compat/telephony/TelephonyManagerCompat.java @@ -25,7 +25,6 @@ import android.support.annotation.Nullable; import android.support.v4.os.BuildCompat; import android.telecom.PhoneAccountHandle; import android.telephony.TelephonyManager; -import com.android.dialer.common.Assert; import com.android.dialer.common.LogUtil; import com.android.dialer.telecom.TelecomUtil; import java.lang.reflect.InvocationTargetException; @@ -133,9 +132,6 @@ public class TelephonyManagerCompat { @Nullable public static Uri getVoicemailRingtoneUri( TelephonyManager telephonyManager, PhoneAccountHandle accountHandle) { - if (VERSION.SDK_INT < VERSION_CODES.N) { - return null; - } return telephonyManager.getVoicemailRingtoneUri(accountHandle); } @@ -149,8 +145,7 @@ public class TelephonyManagerCompat { */ public static boolean isVoicemailVibrationEnabled( TelephonyManager telephonyManager, PhoneAccountHandle accountHandle) { - return VERSION.SDK_INT < VERSION_CODES.N - || telephonyManager.isVoicemailVibrationEnabled(accountHandle); + return telephonyManager.isVoicemailVibrationEnabled(accountHandle); } /** @@ -159,9 +154,6 @@ public class TelephonyManagerCompat { */ public static void setVisualVoicemailEnabled( TelephonyManager telephonyManager, PhoneAccountHandle handle, boolean enabled) { - if (VERSION.SDK_INT < VERSION_CODES.N_MR1) { - Assert.fail("setVisualVoicemailEnabled called on pre-NMR1"); - } try { TelephonyManager.class .getMethod("setVisualVoicemailEnabled", PhoneAccountHandle.class, boolean.class) @@ -177,9 +169,6 @@ public class TelephonyManagerCompat { */ public static boolean isVisualVoicemailEnabled( TelephonyManager telephonyManager, PhoneAccountHandle handle) { - if (VERSION.SDK_INT < VERSION_CODES.N_MR1) { - Assert.fail("isVisualVoicemailEnabled called on pre-NMR1"); - } try { return (boolean) TelephonyManager.class -- cgit v1.2.3