commit b7f93e6f1082d4acd00a9cbe55ec8ebccdf4f8dd
author Treehugger Robot <treehugger-gerrit@google.com> Wed Jul 03 18:08:28 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Jul 03 18:08:28 2019 +0000
tree 9568a84597a50edf548f1a8ff70682bcb24e1858
parent db0b50238b1799ec9e2cbba1b527a3601adbeb8e
parent da8b67be0cc0629ab5777cf8aaed393d9f8e2e6c

Merge "Replace no error code '0' for SMS with '-1'"

Android.mk

diff --git a/Android.mk b/Android.mk
index 9309776..cad55d5 100644
--- a/Android.mk
+++ b/Android.mk
@@ -48,6 +48,7 @@
 
 LOCAL_AAPT_FLAGS += --version-name "$(version_name_package)"
 LOCAL_AAPT_FLAGS += --version-code $(version_code_package)
+LOCAL_AAPT_FLAGS += --legacy
 
 ifdef TARGET_BUILD_APPS
     LOCAL_JNI_SHARED_LIBRARIES := libframesequence libgiftranscode

tests/src/com/android/messaging/datamodel/action/GetOrCreateConversationActionTest.java

diff --git a/tests/src/com/android/messaging/datamodel/action/GetOrCreateConversationActionTest.java b/tests/src/com/android/messaging/datamodel/action/GetOrCreateConversationActionTest.java
index f98d090..1b6b8ba 100644
--- a/tests/src/com/android/messaging/datamodel/action/GetOrCreateConversationActionTest.java
+++ b/tests/src/com/android/messaging/datamodel/action/GetOrCreateConversationActionTest.java
@@ -85,7 +85,8 @@
         assertTrue(result instanceof String);
 
         // Make sure that we created a new conversation
-        assertEquals(TestDataFactory.NUM_TEST_CONVERSATIONS, Integer.parseInt((String)result));
+        int expectedConversationId = TestDataFactory.NUM_TEST_CONVERSATIONS + 1;
+        assertEquals(expectedConversationId, Integer.parseInt((String) result));
 
         // Now get the conversation that we just created again
         monitor = GetOrCreateConversationAction.getOrCreateConversation(participants, null,
@@ -103,7 +104,7 @@
         final String conversationId = (String) result;
 
         // Make sure that we found the same conversation id
-        assertEquals(TestDataFactory.NUM_TEST_CONVERSATIONS, Integer.parseInt((String)result));
+        assertEquals(expectedConversationId, Integer.parseInt((String) result));
 
         final ArrayList<ParticipantData> conversationParticipants =
                 BugleDatabaseOperations.getParticipantsForConversation(db, conversationId);