filab/packages_apps_Messaging
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
522 Commits 1 Branch 0 Tags
be2b581a14b23a8d8e0bb3f36bde56d64e713dd8
Commit Graph
522 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Raman Tenneti be2b581a14 AOSP/Messaging - Fix many improperly formatted resource strings in Messaging. am: a7a1d07ce1 
am: 22744717a7

Change-Id: Ic00f199d25439fdda93715006afb83e1724e06b2
 2019-07-08 18:00:19 -07:00
Raman Tenneti 22744717a7 AOSP/Messaging - Fix many improperly formatted resource strings in Messaging. 
am: a7a1d07ce1

Change-Id: Ic99684432e0d66d9b7fe685ea66fed39976e7f1f
 2019-07-08 17:35:47 -07:00
Raman Tenneti a7a1d07ce1 AOSP/Messaging - Fix many improperly formatted resource strings in Messaging. 
TODO: Need to run translation to fix across all languages.

Bug: 135617299
Test: manual - Did a "make -j40" and verified that there are no warnings in strings.xml.
Change-Id: I3f993fcea42c041d609e0f714cf3b0a2a6383816
 2019-07-08 19:16:28 +00:00
Taesu Lee 0512d2078e Merge "Replace no error code '0' for SMS with '-1'" am: b7f93e6f10 
am: 22d93c0406

Change-Id: Iea7391e23e36fd7a9d7c449457f46743315458c3
 2019-07-03 16:35:23 -07:00
Taesu Lee 22d93c0406 Merge "Replace no error code '0' for SMS with '-1'" 
am: b7f93e6f10

Change-Id: I0e3d28d6d8849bd855b057aceaedf19f54d52171
 2019-07-03 16:23:10 -07:00
Treehugger Robot b7f93e6f10 Merge "Replace no error code '0' for SMS with '-1'" 2019-07-03 18:08:28 +00:00
Xin Li 336a8d81ab DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aosp-master 
Bug: 134405016
Change-Id: I973d953e4c10365e594ddd68516bdc4d7dd0de1c
 2019-07-01 21:00:01 +00:00
Colin Cross 570199e8ab Merge "Pass --legacy to aapt2 compile for Messaging" am: db0b50238b 
am: 443ef0243d

Change-Id: Ibedb1e427ecd68b091b2d4388f52b8fbf5c9c2f8
 2019-06-26 11:42:10 -07:00
Colin Cross 443ef0243d Merge "Pass --legacy to aapt2 compile for Messaging" 
am: db0b50238b

Change-Id: Idc96c3eadb09290d58a005814c79299a6108f321
 2019-06-26 11:06:18 -07:00
Colin Cross db0b50238b Merge "Pass --legacy to aapt2 compile for Messaging" 2019-06-26 17:05:33 +00:00
Taesu Lee b95a19ca46 Fix GetOrCreateConversationActionTest failure am: a019a9da5c 
am: 3616fb5b3e

Change-Id: Iab4b669f556cec46db72678c2b61624c0418996b
 2019-06-25 15:18:38 -07:00
Taesu Lee 3616fb5b3e Fix GetOrCreateConversationActionTest failure 
am: a019a9da5c

Change-Id: I3a4d26642c51f4eaaa393929c9c75f10801ffc68
 2019-06-25 14:51:55 -07:00
Taesu Lee a019a9da5c Fix GetOrCreateConversationActionTest failure 
Test: atest messagingtests

Change-Id: I62a30f50a64a6e6e3f7ce21c0919cb2873654bc2
Signed-off-by: Taesu Lee <taesu82.lee@samsung.com>
 2019-06-25 14:28:08 +09:00
Taesu Lee da8b67be0c Replace no error code '0' for SMS with '-1' 
Use '-1' for no error instead of '0' since the '0' has been one of the
valid error codes in 3GPP2.

Test: Manual

Change-Id: I02ba391a5cd178491868565c10bb3a35ba88e19a
Signed-off-by: Taesu Lee <taesu82.lee@samsung.com>
 2019-06-25 12:31:39 +09:00
Taesu Lee 8ded71f805 Merge "Fix assertion failures caused by different instance type" am: 5500d33555 
am: f390d17b40

Change-Id: I3c04d7dcfbaf99bac711a3f1eff8ee1791d8f438
 2019-06-21 15:41:00 -07:00
Taesu Lee f9b474c443 Merge "Fix MMS Config issues in Debug menu" am: 0e3986db52 
am: eb4206aea1

Change-Id: Ic9a0662a80b4a82a10aeb293136ebbd25e31c98a
 2019-06-21 15:40:22 -07:00
Taesu Lee f390d17b40 Merge "Fix assertion failures caused by different instance type" 
am: 5500d33555

Change-Id: I44b6ae0b8e1b1695fdc4bc1a3d87dc27f7d891d8
 2019-06-21 15:34:11 -07:00
Taesu Lee eb4206aea1 Merge "Fix MMS Config issues in Debug menu" 
am: 0e3986db52

Change-Id: If246db8829a595ff89cb3cf9f36eb038fc013e14
 2019-06-21 15:33:25 -07:00
Treehugger Robot 5500d33555 Merge "Fix assertion failures caused by different instance type" 2019-06-21 22:21:40 +00:00
Treehugger Robot 0e3986db52 Merge "Fix MMS Config issues in Debug menu" 2019-06-21 22:09:41 +00:00
Taesu Lee a22a68f41f Apply new duplication detection logic for M-Notification.ind am: 77a839f1ef 
am: cf5dcfef5a

Change-Id: I66f05f83a35c54e35488d86f44e2286a52abca68
 2019-06-21 12:22:24 -07:00
Taesu Lee cf5dcfef5a Apply new duplication detection logic for M-Notification.ind 
am: 77a839f1ef

Change-Id: I3981fc8f1abccf95a622ca32a7c0ac88d0c3721a
 2019-06-21 12:15:22 -07:00
Colin Cross ef765e414e Pass --legacy to aapt2 compile for Messaging 
This module produces warnings that are treated as errors if --legacy
is not passed.  --legacy is no longer being passed by default, so
add it here.

Bug: 135617299
Test: m java
Change-Id: Ic001d8f4f9afdee3528929d3ba62a6bbade80ab6
 2019-06-20 17:02:12 -07:00
Taesu Lee 77a839f1ef Apply new duplication detection logic for M-Notification.ind 
The X-Mms-Transaction-ID of the M-Notification.ind identifies each
M-Notification.ind message. New duplication detection logic compares
the new X-Mms-Transaction-ID with the stored value to identify the
Network duplicate M-Notification.ind message when it receives a new
M-Notification.ind message.

Following SQL WHERE clause is used to query from the DB.
 ((m_type=NOTIFICATION_IND) OR (m_type=RETRIEVE_CONF)) AND (exp>NOW))
 AND (t_id=xxxxxx)

For this, when the M-Retrieve.conf is received, updates the t_id and the
exp from the corresponding M-Notification.ind so that new logic would
work even after the M-Notification.ind is deleted.

Test: Manual

Change-Id: I86e1eee62ea612d96ca16e5384b044cb6541ff6a
Signed-off-by: Taesu Lee <taesu82.lee@samsung.com>
 2019-06-14 16:45:30 +09:00
Taesu Lee 71e2706105 Merge "Use correct format info for SMS" am: a6f1ae137d 
am: 5089da9e20

Change-Id: I3df58c53ecfe38fccb9be80a8003e5540ac2e478
 2019-06-11 19:14:00 -07:00
Taesu Lee 5089da9e20 Merge "Use correct format info for SMS" 
am: a6f1ae137d

Change-Id: I07892676471be21f0cb025a1547db3ad099ad1a1
 2019-06-11 19:04:47 -07:00
Treehugger Robot a6f1ae137d Merge "Use correct format info for SMS" 2019-06-12 01:38:23 +00:00
Taesu Lee 91e9df451b Merge "Fix SMS status handling" am: 4e3db63e41 
am: 8f649c7078

Change-Id: I706b8d16949f4193fdbb02c1fa0144b971c22bc4
 2019-06-11 17:33:16 -07:00
Taesu Lee a84f2dbad6 Merge "Fix X-Mms-Transaction-ID of M-Acknowledge.ind" am: aa5bde8dbe 
am: 183d4d6c24

Change-Id: I2a2e11a4cdd2edb9201a0af308f90141957facf4
 2019-06-11 17:32:27 -07:00
Taesu Lee 8f649c7078 Merge "Fix SMS status handling" 
am: 4e3db63e41

Change-Id: I08847f6a44a19d37897713fc207a3d7745ce5fa8
 2019-06-11 17:23:51 -07:00
Taesu Lee 183d4d6c24 Merge "Fix X-Mms-Transaction-ID of M-Acknowledge.ind" 
am: aa5bde8dbe

Change-Id: I4d0bab608412a6fc4e9fac41613495f2015017e5
 2019-06-11 17:23:23 -07:00
Treehugger Robot 4e3db63e41 Merge "Fix SMS status handling" 2019-06-12 00:18:44 +00:00
Treehugger Robot aa5bde8dbe Merge "Fix X-Mms-Transaction-ID of M-Acknowledge.ind" 2019-06-12 00:12:16 +00:00
Taesu Lee 429fa7382f Fix wrong PreferenceCategory for SMS delivery report am: 6c3770a7ea 
am: 96f3365b99

Change-Id: Iefe43805914c1903f36a91fc113e81cb49ded520
 2019-06-11 16:08:48 -07:00
Taesu Lee 96f3365b99 Fix wrong PreferenceCategory for SMS delivery report 
am: 6c3770a7ea

Change-Id: I30d8ffa3384c8d6c0fadf3467057fb59b4ae649f
 2019-06-11 16:03:46 -07:00
Taesu Lee 6c3770a7ea Fix wrong PreferenceCategory for SMS delivery report 
Test: Manual

Change-Id: I3008c596e5559e51613ed2da43793187c79381f5
Signed-off-by: Taesu Lee <taesu82.lee@samsung.com>
 2019-05-31 14:54:31 +09:00
Taesu Lee 2771ac7ae9 Fix assertion failures caused by different instance type 
onAttachFragment() with ReportFragment instance is called first since
Support Library 26.1.0 has been applied. Remove assert() and check
instance to fix crash caused by the ReportFragement.

Test: Manual

Change-Id: I5a4d6bdd00ac94c5892527f5fe784b8f19701214
Signed-off-by: Taesu Lee <taesu82.lee@samsung.com>
 2019-05-30 16:52:56 +09:00
Raman Tenneti 2084ce2d5d Merge "Messaging: Fix generating id in android namespace" am: 1e56062ac9 
am: d6b0b845ee

Change-Id: If72c3a0e19c24a2aef7e2a883344e558c77b483d
 2019-05-23 22:14:37 -07:00
Raman Tenneti d6b0b845ee Merge "Messaging: Fix generating id in android namespace" 
am: 1e56062ac9

Change-Id: Ie78fff952bd2add4ec3338af67cbc00954292891
 2019-05-23 17:14:12 -07:00
Raman Tenneti 1e56062ac9 Merge "Messaging: Fix generating id in android namespace" 2019-05-23 22:26:29 +00:00
Taesu Lee 84f8649354 Fix MMS Config issues in Debug menu 
Fix
 - Wrong order of args for update().
 - Wrong and missing configs in keyType map.
And remove MMS config keys from the key list if the keyType map doesn't
include them.

Test: Manual

Change-Id: Ib1876072625187baf15ce6e64f90785ed0ba3df8
Signed-off-by: Taesu Lee <taesu82.lee@samsung.com>
 2019-04-30 15:04:32 +09:00
Raman Tenneti dcd16565cf Merge "AOSP/Messaging - Moved LOCAL_COMPATIBILITY_SUITE to tests/Android.mk. + Deleted the unnecessary blankId check. Updated the TODO comment for NUM_TEST_CONVERSATIONS+4. + Added AndroidTest.xml + Added "LOCAL_PROGUARD_ENABLED := disabled" for tests to pass on cf." am: 90079b43ab 
am: 5ecd041b36

Change-Id: I1115e99373db22f2229077d8498bec765b09a251
 2019-04-24 19:44:06 -07:00
Raman Tenneti 5ecd041b36 Merge "AOSP/Messaging - Moved LOCAL_COMPATIBILITY_SUITE to tests/Android.mk. + Deleted the unnecessary blankId check. Updated the TODO comment for NUM_TEST_CONVERSATIONS+4. + Added AndroidTest.xml + Added "LOCAL_PROGUARD_ENABLED := disabled" for tests to pass on cf." 
am: 90079b43ab

Change-Id: I44e82b085ca5d8ac45b41e3649d8fa985e76eeb5
 2019-04-24 19:38:42 -07:00
Raman Tenneti 90079b43ab Merge "AOSP/Messaging - Moved LOCAL_COMPATIBILITY_SUITE to tests/Android.mk. + Deleted the unnecessary blankId check. Updated the TODO comment for NUM_TEST_CONVERSATIONS+4. + Added AndroidTest.xml + Added "LOCAL_PROGUARD_ENABLED := disabled" for tests to pass on cf." 2019-04-25 02:28:48 +00:00
Raman Tenneti a3b82b5fff AOSP/Messaging - Moved LOCAL_COMPATIBILITY_SUITE to tests/Android.mk. 
+ Deleted the unnecessary blankId check. Updated the TODO comment for NUM_TEST_CONVERSATIONS+4.
+ Added AndroidTest.xml
+ Added "LOCAL_PROGUARD_ENABLED := disabled" for tests to pass on cf.

Bug: 126516784

Test: make messagingtests and tested the messaging UI manually. Ran the following CTS tests on Pixel phone.

$ make -j 40
  -rw-r--r-- 1 rtenneti primarygroup 8529760 Mar  8 16:46 out/target/product/marlin/system/app/messaging/messaging.apk

$ make messagingtests -j
  -rw-r--r-- 1 rtenneti primarygroup 729713 Mar 13 14:22 out/target/product/marlin/testcases/messagingtests/messagingtests.apk

$ adb install -r -d out/target/product/marlin/system/app/messaging/messaging.apk
$ adb install -r -d out/target/product/marlin/testcases/messagingtests/messagingtests.apk

atest
-----
$ cd .../packages/apps/Messaging
$ atest
  ...
  Results from tests that require device:

  Summary
  -------
  messagingtests: Passed: 113, Failed: 0, Ignored: 0

  All tests passed!

acloud test
-----------
$ lunch aosp_cf_x86_phone-userdebug

$ make -j 40
  -rw-r--r-- 1 rtenneti primarygroup 10585182 Mar 15 15:19 ./target/product/vsoc_x86/system/app/messaging/messaging.apk
$ make messagingtests -j
  -rw-r--r-- 1 rtenneti primarygroup 643697 Mar 15 15:57 ./target/product/vsoc_x86/system/app/messagingtests/messagingtests.apk

$ acloud reconnect
$ adb devices
  List of devices attached
  127.0.0.1:52761	device

$ adb install -r -d out/target/product/vsoc_x86/system/app/messaging/messaging.apk
$ adb install -r -d out/target/product/vsoc_x86/system/app/messagingtests/messagingtests.apk

$ cd packages/apps/Messaging
$ atest messagingtests -- --abi x86 --serial 127.0.0.1:52761

Change-Id: I6b1143db6c596805f3c48f310323e0e02d344d00
 2019-04-24 22:32:45 +00:00
Raman Tenneti 4480596041 AOSP/Messaging - Remove TEST_MAPPING because presubmit tests fail on build_target: aosp_cf_x86_phone-userdebug am: c10a188d5c 
am: d27676a25a

Change-Id: I2b4c3920fb450bc369e0e31a361d39f989e06849
 2019-04-17 13:08:19 -07:00
Raman Tenneti d27676a25a AOSP/Messaging - Remove TEST_MAPPING because presubmit tests fail on build_target: aosp_cf_x86_phone-userdebug 
am: c10a188d5c

Change-Id: Ie2e02b3f52c5b6fd6b8cf4a37ece4ac63c8b0fef
 2019-04-17 12:52:53 -07:00
Raman Tenneti c10a188d5c AOSP/Messaging - Remove TEST_MAPPING because presubmit tests fail on build_target: aosp_cf_x86_phone-userdebug 
BUG: 126516784

Test: No impact. TEST_MAPPING wasn't enabled before, thus removing the file shouldn't have an impact.
Change-Id: Ib206cb6d921b59a032e6557352c6961310b08272
 2019-04-17 10:24:20 -07:00
Colin Cross bb4d4f29a7 [automerger skipped] Update messaging for guava 27.1 am: 485b019679 
am: dbf9e67132 -s ours
am skip reason: change_id I21473e2aa5e432b135fac7f1ecf0a85f52f3951e with SHA1 63cffd0246 is in history

Change-Id: Ic8419a0416b126f16533acdca4b3c466af093494
 2019-04-16 17:17:00 -07:00
Colin Cross dbf9e67132 Update messaging for guava 27.1 
am: 485b019679

Change-Id: I39ed624add43b2c1d0a2ecb6d75fad7c091bd7b2
 2019-04-16 16:34:50 -07:00