Commit Graph
1354 Commits
Author SHA1 Message Date
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
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 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
Colin Cross 63cffd0246 Update messaging for guava 27.1
CharMatcher.ASCII has been replaced with CharMatcher.ascii().

Bug: 130306229
Test: m checkbuild
Change-Id: I21473e2aa5e432b135fac7f1ecf0a85f52f3951e
2019-04-11 16:38:17 -07:00
Raman Tenneti 908b3e7019 AOSP/Messaging - Update the Messaging version to 24 until notification related logic changes are made. Fixes the error "Developer warning for package com.android. messaging failed to post notification on channel null". am: 8e71d1b707 am: 315d8d3f70
am: efa64556a3

Change-Id: Icc641757b5bf07d79fb918b9d4b5f0488e013653
2019-04-09 05:26:18 -07:00
Raman Tenneti efa64556a3 AOSP/Messaging - Update the Messaging version to 24 until notification related logic changes are made. Fixes the error "Developer warning for package com.android. messaging failed to post notification on channel null". am: 8e71d1b707
am: 315d8d3f70

Change-Id: I9d863a763a139d7a2ca987df18fb829f34ffed40
2019-04-09 03:54:43 -07:00
Raman Tenneti 315d8d3f70 AOSP/Messaging - Update the Messaging version to 24 until notification related logic changes are made. Fixes the error "Developer warning for package com.android. messaging failed to post notification on channel null".
am: 8e71d1b707

Change-Id: Iaca20ad962131fa5629b77789e9e853c6f0b39ce
2019-04-07 11:35:14 -07:00
Raman Tenneti 8e71d1b707 AOSP/Messaging - Update the Messaging version to 24 until notification related logic changes are made.
Fixes the error "Developer warning for package com.android. messaging failed to post notification on channel null".

Bug: 130046636

Test: manual - Tested the messaging UI. Ran the following CTS tests on Pixel phone.

$ make -j 40
$ make messagingtests -j
$ find out -name "messaging*.apk" -print -exec ls -l {} \;
  -rw-r--r-- 1 rtenneti primarygroup 8529760 Apr  5 18:50 out/target/product/marlin/system/app/messaging/messaging.apk
  -rw-r--r-- 1 rtenneti primarygroup 729713 Apr  5 18:54 out/target/product/marlin/testcases/messagingtests/arm64/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/arm64/messagingtests.apk

$ adb shell am instrument -w com.android.messaging.test
  Time: 12.766
  OK (113 tests)

CTS tests for Mesaging app
---------------------------
$ ./development/testrunner/runtest.py --path cts/tests/app/src/android/app/cts/NotificationTest.java
  adb  shell am instrument -e class 'android.app.cts.NotificationTest' -w 'android.app.cts/androidx.test.runner.AndroidJUnitRunner'
  android.app.cts.NotificationTest:...........................
  Time: 0.2
  OK (27 tests)

atest
-----
$ cd packages/apps/Messaging
$ atest
  Summary
  -------
  messagingtests: Passed: 113, Failed: 0, Ignored: 0

Change-Id: Ic263e2c63d675c40a2cfa1ca0a8776c8e2b510b9
2019-04-05 19:04:14 -07:00
Bill Rassieur cbfb819a94 Merge master@5406228 into qt-dev. am: 7fa670a9f9
am: 87dd3eec55

Change-Id: Iae99c784ea7885a17e99135b5425b855c8ea4c17
2019-04-03 18:06:20 -07:00
Bill Rassieur 30ca474292 Merge master@5406228 into git_qt-dev-plus-aosp.
am: d8430343b6

Change-Id: Ibad0bf0ffdf576321a3762e067dd877e5f4d603f
2019-04-03 16:57:40 -07:00
Bill Rassieur 87dd3eec55 Merge master@5406228 into qt-dev.
am: 7fa670a9f9

Change-Id: I9e954370b6f74e9fed99e78e8156e64d310461ca
2019-04-03 09:45:05 -07:00
Bill Rassieur d8430343b6 Merge master@5406228 into git_qt-dev-plus-aosp.
Change-Id: I67f4b680887fa8fc373113d02cb9a1234b2a7353
BUG: 129345239
2019-03-29 04:26:02 +00:00
Bill Rassieur 7fa670a9f9 Merge master@5406228 into qt-dev.
Change-Id: I4a9fbb4c53a2696230fbdc26bb4d303171696eee
BUG: 129345239
2019-03-28 16:39:54 +00:00
Raman Tenneti 271e79a7cb Revert "AOSP/Messaging - Added LOCAL_COMPATIBILITY_SUITE := device-tests to fix "Missing test_suite setting for test"." am: 7d08344e9b am: 4909a68c63
am: a75208c630

Change-Id: I4ffb150a38350e47c687771518477df2b2403526
2019-03-22 13:42:42 -07:00
Raman Tenneti a75208c630 Revert "AOSP/Messaging - Added LOCAL_COMPATIBILITY_SUITE := device-tests to fix "Missing test_suite setting for test"." am: 7d08344e9b
am: 4909a68c63

Change-Id: Idf4bf179cb51decc6d319252c23236b3be5a0776
2019-03-22 13:38:42 -07:00
Raman Tenneti 4909a68c63 Revert "AOSP/Messaging - Added LOCAL_COMPATIBILITY_SUITE := device-tests to fix "Missing test_suite setting for test"."
am: 7d08344e9b

Change-Id: I718abce9535d773fb02bf23e63b555e47a31c410
2019-03-22 13:35:40 -07:00
Raman Tenneti 7d08344e9b Revert "AOSP/Messaging - Added LOCAL_COMPATIBILITY_SUITE := device-tests to fix "Missing test_suite setting for test"."
This reverts commit bada9f9b46.

Reason for revert: <INSERT REASONING HERE>

Change-Id: I17281de5c14e7c285d263729167f208cbea4f7d5
2019-03-22 18:08:22 +00:00
Taesu Lee 4708388210 Use correct format info for SMS
Use correct format to
 - Parse SMS delivery report.
 - Dump/Load SMS to/from the dump file.

TODO: Update message text state during composing.
Test: Manual

Change-Id: I7e53bed86130484a634c9305b276e2586db31796
Signed-off-by: Taesu Lee <taesu82.lee@samsung.com>
2019-03-21 13:23:40 +09:00
Taesu Lee 4b1c6eb2c9 Fix SMS status handling
Simple matching up CDMA status with GSM TP-Status for common handling.
And fix bugleStatusForSMS() for all the permanent error cases.

Note: Need to check SC operation for ERROR_TEMPORARY.
Test: Manual

Change-Id: Ic8136d273dc0c25a4f0690f951d4d8aca20579ff
Signed-off-by: Taesu Lee <taesu82.lee@samsung.com>
2019-03-15 16:22:48 +09:00
Taesu Lee 87811542d0 Fix X-Mms-Transaction-ID of M-Acknowledge.ind
X-Mms-Transaction-ID of M-Acknowledge.ind should be set as the
corresponding M-Retrieve.conf's transaction ID instead of
M-Notification.ind's one.
(OMA-TS-MMS_ENC-V1_3-20110913-A)

Test: Manual

Change-Id: I250f32b93cdfbed815206543df5486efa4df18eb
Signed-off-by: Taesu Lee <taesu82.lee@samsung.com>
2019-03-13 12:16:09 +09:00
Michael Bestas a6accb4a53 Messaging: Fix generating id in android namespace
Fixes:
res/layout/apn_preference_layout.xml:40: warn:
generated id 'android:id/title' for external package 'android'.
res/layout/apn_preference_layout.xml:48: warn:
generated id 'android:id/summary' for external package 'android'.

Change-Id: Ia096fa2e072ba4391e3adad52d3f9c9abed0e976
2019-03-03 16:23:45 +02:00
Raman Tenneti 7900c4cb02 AOSP/Messaging - Added LOCAL_COMPATIBILITY_SUITE := device-tests to fix "Missing test_suite setting for test". am: bada9f9b46 am: 62f573f1ef
am: 10d7e7db2a

Change-Id: I62cb167f0cf28d2c9327b646eb24a6e7b88e72be
2019-02-27 15:01:36 -08:00
Raman Tenneti 10d7e7db2a AOSP/Messaging - Added LOCAL_COMPATIBILITY_SUITE := device-tests to fix "Missing test_suite setting for test". am: bada9f9b46
am: 62f573f1ef

Change-Id: I1dcf047ed00cdfeb778714322d2339312b41a134
2019-02-27 14:57:32 -08:00
Raman Tenneti 62f573f1ef AOSP/Messaging - Added LOCAL_COMPATIBILITY_SUITE := device-tests to fix "Missing test_suite setting for test".
am: bada9f9b46

Change-Id: I9e4443ddc278dd1f5bb3cd42dac451578538e2f8
2019-02-27 14:52:28 -08:00