From 57fdc2b9ab68bff217d4c9c605ef89cefd66f678 Mon Sep 17 00:00:00 2001
From: calderwoodra <calderwoodra@google.com>
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 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

(limited to 'java/com/android/dialer/compat/CompatUtils.java')

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. */
-- 
cgit v1.2.3