Remove obsolete version checks and compat utilities after min SDK was bumped up to N.

Test: Existing tests
PiperOrigin-RevId: 190508397
Change-Id: Ia5f33e45af1d1cc666fec5f43efa564b2b68c193

3 files changed, 8 insertions, 19 deletions

diff --git a/java/com/android/dialer/app/calllog/CallLogAdapter.java b/java/com/android/dialer/app/calllog/CallLogAdapter.java
index de9b95e34..d25a2f38d 100644
--- a/java/com/android/dialer/app/calllog/CallLogAdapter.java
+++ b/java/com/android/dialer/app/calllog/CallLogAdapter.java
@@ -945,10 +945,8 @@ public class CallLogAdapter extends GroupingListAdapter
       Cursor cursor, int count, final CallLogListItemViewHolder views) {
     Assert.isMainThread();
     final String number = cursor.getString(CallLogQuery.NUMBER);
-    final String postDialDigits =
-        (VERSION.SDK_INT >= VERSION_CODES.N) ? cursor.getString(CallLogQuery.POST_DIAL_DIGITS) : "";
-    final String viaNumber =
-        (VERSION.SDK_INT >= VERSION_CODES.N) ? cursor.getString(CallLogQuery.VIA_NUMBER) : "";
+    final String postDialDigits = cursor.getString(CallLogQuery.POST_DIAL_DIGITS);
+    final String viaNumber = cursor.getString(CallLogQuery.VIA_NUMBER);
     final int numberPresentation = cursor.getInt(CallLogQuery.NUMBER_PRESENTATION);
     final ContactInfo cachedContactInfo = ContactInfoHelper.getContactInfo(cursor);
     final int transcriptionState =
diff --git a/java/com/android/dialer/app/list/DragDropController.java b/java/com/android/dialer/app/list/DragDropController.java
index 458e31e69..1c33a8a09 100644
--- a/java/com/android/dialer/app/list/DragDropController.java
+++ b/java/com/android/dialer/app/list/DragDropController.java
@@ -16,8 +16,6 @@
 
 package com.android.dialer.app.list;
 
-import android.os.Build.VERSION;
-import android.os.Build.VERSION_CODES;
 import android.view.View;
 import java.util.ArrayList;
 import java.util.List;
@@ -38,22 +36,15 @@ public class DragDropController {
 
   /** @return True if the drag is started, false if the drag is cancelled for some reason. */
   boolean handleDragStarted(View v, int x, int y) {
-    int screenX = x;
-    int screenY = y;
-    // The coordinates in dragEvent of DragEvent.ACTION_DRAG_STARTED before NYC is window-related.
-    // This is fixed in NYC.
-    if (VERSION.SDK_INT >= VERSION_CODES.N) {
-      v.getLocationOnScreen(locationOnScreen);
-      screenX = x + locationOnScreen[0];
-      screenY = y + locationOnScreen[1];
-    }
-    final PhoneFavoriteSquareTileView tileView =
-        dragItemContainer.getViewForLocation(screenX, screenY);
+    v.getLocationOnScreen(locationOnScreen);
+    x = x + locationOnScreen[0];
+    y = y + locationOnScreen[1];
+    final PhoneFavoriteSquareTileView tileView = dragItemContainer.getViewForLocation(x, y);
     if (tileView == null) {
       return false;
     }
     for (int i = 0; i < onDragDropListeners.size(); i++) {
-      onDragDropListeners.get(i).onDragStarted(screenX, screenY, tileView);
+      onDragDropListeners.get(i).onDragStarted(x, y, tileView);
     }
 
     return true;
diff --git a/java/com/android/dialer/app/settings/DialerSettingsActivity.java b/java/com/android/dialer/app/settings/DialerSettingsActivity.java
index 09fe03ef5..6b763aeb3 100644
--- a/java/com/android/dialer/app/settings/DialerSettingsActivity.java
+++ b/java/com/android/dialer/app/settings/DialerSettingsActivity.java
@@ -128,7 +128,7 @@ public class DialerSettingsActivity extends AppCompatPreferenceActivity {
       callSettingsHeader.titleRes = R.string.call_settings_label;
       callSettingsHeader.intent = callSettingsIntent;
       target.add(callSettingsHeader);
-    } else if ((VERSION.SDK_INT >= VERSION_CODES.N) || isPrimaryUser) {
+    } else if (isPrimaryUser) {
       Header phoneAccountSettingsHeader = new Header();
       Intent phoneAccountSettingsIntent = new Intent(TelecomManager.ACTION_CHANGE_PHONE_ACCOUNTS);
       phoneAccountSettingsIntent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);