Taesu Lee
80f974e73e
Merge "Fix MMS Config issues in Debug menu" am: 0e3986db52 am: eb4206aea1 am: f9b474c443
...
am: 77ddd2dcbe
Change-Id: I2520a203f035efcf0afe0e8f15f2dc21335a634e
2019-06-21 15:55:29 -07:00
Taesu Lee
77ddd2dcbe
Merge "Fix MMS Config issues in Debug menu" am: 0e3986db52 am: eb4206aea1
...
am: f9b474c443
Change-Id: Ieb39c568893cde8c8b1fb880368a13967aff1c8d
2019-06-21 15:52:33 -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
eb4206aea1
Merge "Fix MMS Config issues in Debug menu"
...
am: 0e3986db52
Change-Id: If246db8829a595ff89cb3cf9f36eb038fc013e14
2019-06-21 15:33:25 -07:00
Treehugger Robot
0e3986db52
Merge "Fix MMS Config issues in Debug menu"
2019-06-21 22:09:41 +00:00
Taesu Lee
f2febe62af
Apply new duplication detection logic for M-Notification.ind am: 77a839f1ef am: cf5dcfef5a am: a22a68f41f
...
am: b914b9a1ec
Change-Id: I1d27910eb7e52a5c18cd6db5f62682152dd28bc3
2019-06-21 12:33:34 -07:00
Taesu Lee
b914b9a1ec
Apply new duplication detection logic for M-Notification.ind am: 77a839f1ef am: cf5dcfef5a
...
am: a22a68f41f
Change-Id: I98fd90d012c6a464d36b7c1ff4c754ed827de504
2019-06-21 12:27:38 -07: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
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
4b6794a205
Merge "Use correct format info for SMS" am: a6f1ae137d am: 5089da9e20 am: 71e2706105
...
am: 3d4179e358
Change-Id: I5832a9a39524fc3a60b1c27d0d9e7c9645107637
2019-06-11 19:24:10 -07:00
Taesu Lee
3d4179e358
Merge "Use correct format info for SMS" am: a6f1ae137d am: 5089da9e20
...
am: 71e2706105
Change-Id: I6686ffaea0c66b7bfa64d1016b7773e4a18e24e9
2019-06-11 19:16:50 -07: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
7e2877c793
Merge "Fix SMS status handling" am: 4e3db63e41 am: 8f649c7078 am: 91e9df451b
...
am: 5c9504ba20
Change-Id: Ie4112592565881ea57c9192564c4c7ca0a6f31b0
2019-06-11 17:49:00 -07:00
Taesu Lee
1856bce196
Merge "Fix X-Mms-Transaction-ID of M-Acknowledge.ind" am: aa5bde8dbe am: 183d4d6c24 am: a84f2dbad6
...
am: 87e7583d08
Change-Id: I4fe07eab5943afa4de3d50d8163d3ae175b107c5
2019-06-11 17:48:27 -07:00
Taesu Lee
5c9504ba20
Merge "Fix SMS status handling" am: 4e3db63e41 am: 8f649c7078
...
am: 91e9df451b
Change-Id: Ifa13bd79605bd60bdfe2a72dc377b5d432b53ebb
2019-06-11 17:39:08 -07:00
Taesu Lee
87e7583d08
Merge "Fix X-Mms-Transaction-ID of M-Acknowledge.ind" am: aa5bde8dbe am: 183d4d6c24
...
am: a84f2dbad6
Change-Id: I7b92abebb7cdb4342404d7a5d1276ea5d701db99
2019-06-11 17:38:30 -07: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
b6dc76e4ec
Fix wrong PreferenceCategory for SMS delivery report am: 6c3770a7ea am: 96f3365b99 am: 429fa7382f
...
am: ceaade33fd
Change-Id: I2340f9c16e2421e2ae34937eb346654ce833f982
2019-06-11 16:34:17 -07:00
Taesu Lee
ceaade33fd
Fix wrong PreferenceCategory for SMS delivery report am: 6c3770a7ea am: 96f3365b99
...
am: 429fa7382f
Change-Id: Id4bb123e72543aa8408fadf5b3f650ad70cd7e91
2019-06-11 16:19:53 -07: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
Raman Tenneti
4ef18dead7
Merge "Messaging: Fix generating id in android namespace" am: 1e56062ac9 am: d6b0b845ee am: 2084ce2d5d
...
am: 53c1f09d06
Change-Id: I09a7faa8248d60c97232ed235007af50d1866d60
2019-05-24 02:33:41 -07:00
Raman Tenneti
53c1f09d06
Merge "Messaging: Fix generating id in android namespace" am: 1e56062ac9 am: d6b0b845ee
...
am: 2084ce2d5d
Change-Id: I6dee83c0d8dcf71152ed02b066ecc61b9bcafb58
2019-05-23 23:26:58 -07: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
767cc75d45
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
...
am: dcd16565cf
Change-Id: Iafae5719409e38aa050cb010ee7e9d2ad96d2c94
2019-04-24 20:35:58 -07: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
72143bf668
AOSP/Messaging - Remove TEST_MAPPING because presubmit tests fail on build_target: aosp_cf_x86_phone-userdebug am: c10a188d5c am: d27676a25a
...
am: 4480596041
Change-Id: I97ecf0258c9018134e6594c710ba35f14403ddfa
2019-04-17 20:53:46 -07: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
90488c23c5
[automerger skipped] Update messaging for guava 27.1 am: 485b019679 am: dbf9e67132 -s ours
...
am: bb4d4f29a7 -s ours
am skip reason: change_id I21473e2aa5e432b135fac7f1ecf0a85f52f3951e with SHA1 63cffd0246 is in history
Change-Id: Id3ead75024e3144c47180b3aef57a561ef5d8d2c
2019-04-16 19:51:13 -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
Colin Cross
485b019679
Update messaging for guava 27.1
...
CharMatcher.ASCII has been replaced with CharMatcher.ascii().
Bug: 130306229
Test: m checkbuild
Change-Id: I21473e2aa5e432b135fac7f1ecf0a85f52f3951e
Merged-In: I21473e2aa5e432b135fac7f1ecf0a85f52f3951e
Exempt-From-Owner-Approval: cherry pick
(cherry picked from commit 63cffd0246 )
2019-04-15 21:45:16 -07:00
Colin Cross
b3650c11b3
Update messaging for guava 27.1
...
am: 63cffd0246
Change-Id: I037fb88b9dc3ef47df7341f0ee37e6d59c6eb181
2019-04-15 21:32:50 -07:00