Messaging: Remove compatibility for old android versions

Change-Id: Id9065d60525a509271a0e64c0e349e857cb998e2

src/com/android/messaging/datamodel/data/ConversationData.java

@@ -51,7 +51,6 @@ import com.android.messaging.util.Assert;
 import com.android.messaging.util.Assert.RunsOnMainThread;
 import com.android.messaging.util.ContactUtil;
 import com.android.messaging.util.LogUtil;
-import com.android.messaging.util.OsUtil;
 import com.android.messaging.util.PhoneUtils;
 import com.android.messaging.util.SafeAsyncTask;
 import com.android.messaging.widget.WidgetConversationProvider;
@@ -595,7 +594,7 @@ public class ConversationData extends BindableData {
         Assert.isTrue(TextUtils.equals(mConversationId, message.getConversationId()));
         Assert.isTrue(binding.getData() == this);
 
-        if (!OsUtil.isAtLeastL_MR1() || message.getSelfId() == null) {
+        if (message.getSelfId() == null) {
             InsertNewMessageAction.insertNewMessage(message);
         } else {
             final int systemDefaultSubId = PhoneUtils.getDefault().getDefaultSmsSubscriptionId();
@@ -767,8 +766,7 @@ public class ConversationData extends BindableData {
         // 1. Framework has MSIM support AND
         // 2. The device has had multiple *active* subscriptions. AND
         // 3. The message's subscription is active.
-        if (OsUtil.isAtLeastL_MR1() &&
-                selfParticipantsData.getSelfParticipantsCountExcludingDefault(true) > 1) {
+        if (selfParticipantsData.getSelfParticipantsCountExcludingDefault(true) > 1) {
             return subscriptionListData.getActiveSubscriptionEntryBySelfId(selfParticipantId,
                     excludeDefault);
         }

src/com/android/messaging/datamodel/data/SelfParticipantsData.java

@@ -24,8 +24,6 @@ import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
 
-import com.android.messaging.util.OsUtil;
-
 /**
  * A class that contains the list of all self participants potentially involved in a conversation.
  * This class contains both active/inactive self entries when there is multi-SIM support.
@@ -86,9 +84,6 @@ public class SelfParticipantsData {
      * Returns if a given self id represents the default self.
      */
     boolean isDefaultSelf(final String selfId) {
-        if (!OsUtil.isAtLeastL_MR1()) {
-            return true;
-        }
         final ParticipantData self = getSelfParticipantById(selfId);
         return self == null ? false : self.getSubId() == ParticipantData.DEFAULT_SELF_SUB_ID;
     }

src/com/android/messaging/datamodel/data/SettingsData.java

@@ -31,7 +31,6 @@ import com.android.messaging.datamodel.binding.BindableData;
 import com.android.messaging.datamodel.binding.BindingBase;
 import com.android.messaging.util.Assert;
 import com.android.messaging.util.LogUtil;
-import com.android.messaging.util.OsUtil;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -200,7 +199,7 @@ public class SettingsData extends BindableData implements
         // platorm is at least L-MR1 and there are multiple active SIMs.
         final int activeSubCountExcludingDefault =
                 mSelfParticipantsData.getSelfParticipantsCountExcludingDefault(true);
-        if (OsUtil.isAtLeastL_MR1() && activeSubCountExcludingDefault > 0) {
+        if (activeSubCountExcludingDefault > 0) {
             for (ParticipantData self : selfs) {
                 if (!self.isDefaultSelf()) {
                     if (activeSubCountExcludingDefault > 1) {