Messaging: Replace explicit types

Change-Id: I2165b3dec73973a2a82d8b3c7c364b5f011e597d

src/com/android/messaging/sms/DatabaseMessages.java

@@ -218,8 +218,7 @@ public class DatabaseMessages {
             mBody = in.readString();
         }
 
-        public static final Parcelable.Creator<SmsMessage> CREATOR
-                = new Parcelable.Creator<SmsMessage>() {
+        public static final Parcelable.Creator<SmsMessage> CREATOR = new Parcelable.Creator<>() {
             @Override
             public SmsMessage createFromParcel(final Parcel in) {
                 return new SmsMessage(in);
@@ -488,15 +487,14 @@ public class DatabaseMessages {
             mRetrieveStatus = in.readInt();
 
             final int nParts = in.readInt();
-            mParts = new ArrayList<MmsPart>();
+            mParts = new ArrayList<>();
             mPartsProcessed = false;
             for (int i = 0; i < nParts; i++) {
                 mParts.add((MmsPart) in.readParcelable(getClass().getClassLoader()));
             }
         }
 
-        public static final Parcelable.Creator<MmsMessage> CREATOR
-                = new Parcelable.Creator<MmsMessage>() {
+        public static final Parcelable.Creator<MmsMessage> CREATOR = new Parcelable.Creator<>() {
             @Override
             public MmsMessage createFromParcel(final Parcel in) {
                 return new MmsMessage(in);
@@ -822,8 +820,7 @@ public class DatabaseMessages {
             mSize = in.readLong();
         }
 
-        public static final Parcelable.Creator<MmsPart> CREATOR
-                = new Parcelable.Creator<MmsPart>() {
+        public static final Parcelable.Creator<MmsPart> CREATOR = new Parcelable.Creator<>() {
             @Override
             public MmsPart createFromParcel(final Parcel in) {
                 return new MmsPart(in);
@@ -905,7 +902,7 @@ public class DatabaseMessages {
         }
 
         public static final Parcelable.Creator<LocalDatabaseMessage> CREATOR
-                = new Parcelable.Creator<LocalDatabaseMessage>() {
+                = new Parcelable.Creator<>() {
             @Override
             public LocalDatabaseMessage createFromParcel(final Parcel in) {
                 return new LocalDatabaseMessage(in);

src/com/android/messaging/sms/MmsSmsUtils.java

@@ -163,7 +163,7 @@ public class MmsSmsUtils {
          * messages.
          */
         public static long getOrCreateThreadId(final Context context, final String recipient) {
-            final Set<String> recipients = new HashSet<String>();
+            final Set<String> recipients = new HashSet<>();
 
             recipients.add(recipient);
             return getOrCreateThreadId(context, recipients);

src/com/android/messaging/sms/MmsUtils.java

@@ -763,7 +763,7 @@ public class MmsUtils {
             Uri.parse("content://mms-sms/canonical-address");
 
     private static List<String> getAddresses(final Context context, final String spaceSepIds) {
-        final List<String> numbers = new ArrayList<String>();
+        final List<String> numbers = new ArrayList<>();
         final String[] ids = spaceSepIds.split(" ");
         for (final String id : ids) {
             long longId;
@@ -813,7 +813,7 @@ public class MmsUtils {
     // Get telephony SMS thread ID
     public static long getOrCreateSmsThreadId(final Context context, final String dest) {
         // use destinations to determine threadId
-        final Set<String> recipients = new HashSet<String>();
+        final Set<String> recipients = new HashSet<>();
         recipients.add(dest);
         try {
             return MmsSmsUtils.Threads.getOrCreateThreadId(context, recipients);
@@ -829,7 +829,7 @@ public class MmsUtils {
             return -1;
         }
         // use destinations to determine threadId
-        final Set<String> recipients = new HashSet<String>(dests);
+        final Set<String> recipients = new HashSet<>(dests);
         try {
             return MmsSmsUtils.Threads.getOrCreateThreadId(context, recipients);
         } catch (final IllegalArgumentException e) {

src/com/android/messaging/sms/SmsSender.java

@@ -62,7 +62,7 @@ public class SmsSender {
      * A map for pending sms messages. The key is the random request UUID.
      */
     private static final ConcurrentHashMap<Uri, SendResult> sPendingMessageMap =
-            new ConcurrentHashMap<Uri, SendResult>();
+            new ConcurrentHashMap<>();
 
     private static final Random RANDOM = new Random();
 
@@ -256,8 +256,8 @@ public class SmsSender {
         Assert.notNull(context);
         final SmsManager smsManager = PhoneUtils.get(subId).getSmsManager();
         final int messageCount = messages.size();
-        final ArrayList<PendingIntent> deliveryIntents = new ArrayList<PendingIntent>(messageCount);
-        final ArrayList<PendingIntent> sentIntents = new ArrayList<PendingIntent>(messageCount);
+        final ArrayList<PendingIntent> deliveryIntents = new ArrayList<>(messageCount);
+        final ArrayList<PendingIntent> sentIntents = new ArrayList<>(messageCount);
         for (int i = 0; i < messageCount; i++) {
             // Make pending intents different for each message part
             final int partId = (messageCount <= 1 ? 0 : i + 1);