Commit Graph

84 Commits

Author SHA1 Message Date
Treehugger Robot
5c8f5fdeb1 Merge "Use file extension based on MIME type" 2020-02-06 20:41:08 +00:00
Taesu Lee
0770975c8a Use file extension based on MIME type
It uses the most common extension for the given MIME type.

Test: Manual

Change-Id: I3d4aea85fcd42088ed19898054db7225954d3401
Signed-off-by: Taesu Lee <taesu82.lee@samsung.com>
2020-02-05 16:08:02 +09:00
Taesu Lee
36a41d3e9d Fix showing wrong image on document picker item
Set mDetachedRequestDescriptor as null for document picker to prevent
calling setImageResourceId() in onAttachedToWindow().

Test: Manual

Change-Id: Ied5ca200cac350ef4b2420269763dfc240fc97c4
Signed-off-by: Taesu Lee <taesu82.lee@samsung.com>
2020-02-05 15:53:23 +09:00
Taesu Lee
8ad8631f0c Merge "Sort ParticipantsData in order of the slot id"
am: 00228481c9

Change-Id: If4cb521dc1523dad4427dcbfad062f75855b60a4
2019-08-12 13:10:07 -07:00
Treehugger Robot
00228481c9 Merge "Sort ParticipantsData in order of the slot id" 2019-08-12 19:40:44 +00:00
Taesu Lee
6da2bf2c03 Ignore unexpected ACTION_DOWN for SIM avatar icons
am: 7ccc6d1b9f

Change-Id: I776323b4fa701202c39be57b08411cea01b540fa
2019-08-02 16:09:19 -07:00
Taesu Lee
7ccc6d1b9f Ignore unexpected ACTION_DOWN for SIM avatar icons
Unexpected ACTION_DOWN raises setColorFilter() for SIM avatar icons in
the SIM switcher. However, other actions to clear the filter cannot be
received due to no clickable attribute.

Test: Click SIM icon in SimSelectorView.

Change-Id: Ic5972522a3442e3087c474b65add38a6d00511a5
Signed-off-by: Taesu Lee <taesu82.lee@samsung.com>
2019-08-02 16:05:47 +09:00
Taesu Lee
b22bc643ce Sort ParticipantsData in order of the slot id
getSelfParticipants() returns the ParticipantData list arranged in
ascending order of the slot id to show SIM UIs from lowest to highest id
consistently.

Test: Verify SettingsFragment and SimSelector order in multi-sim device

Change-Id: I0f5f27c6467cb21a6d11271d1a0a6beef36630a6
Signed-off-by: Taesu Lee <taesu82.lee@samsung.com>
2019-08-01 18:38:40 +09: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
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
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
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
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
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
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
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
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
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
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
b29b72ea05 AOSP/Messaging - update the Messaging version to target P (28) or higher. Use JobIntentService to start the Backgroundworkerservice and ActionServiceImpl services. am: cdf40bb061 am: b966c435c6
am: 1d423c5fe5

Change-Id: Ibc75e9508f7c82368e282624ba8a06f41a6ce5f8
2019-02-20 03:16:31 -08:00
Raman Tenneti
cdf40bb061 AOSP/Messaging - update the Messaging version to target P (28) or higher.
Use JobIntentService to start the Backgroundworkerservice and
ActionServiceImpl services.

+ Deleted WakeLock code.
+ Made changes to com.android.messaging.test tests so that all tests
  pass with the new JobService. I am not sure if these tests passed
  before these changes.
+ CTS tests passed without any changes.
+ Added TEST_MAPPING file for presubmit tests.

Bug: 115499280
Bug: 119503204

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

$ make -j 40
  rw-r--r-- 1 rtenneti primarygroup 8624061 Feb 19 12:37 out/target/product/marlin/system/app/messaging/messaging.apk

$ make messagingtests -j
  -rw-r--r-- 1 rtenneti primarygroup 729713 Feb 19 12:52 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

$ adb shell am instrument -w com.android.messaging.test
  Test results for InstrumentationTestRunner=...........
  Time: 13.353
  OK (113 tests)

CTS tests for Mesaging app
---------------------------
$ ./development/testrunner/runtest.py --path cts/tests/app/src/android/app/cts/NotificationTest.java
  android.app.cts.NotificationTest:...........................
  Time: 0.299
  OK (27 tests)

atest
-----
$ cd .../packages/apps/Messaging
$ atest
  Running Tests...
  messagingtests (113 Tests)
  -------------------------
  ...
  [113/113] com.android.messaging.util.YouTubeUtilTest#testGetYoutubePreviewImageLink: PASSED (2ms)

  Results from tests that require device:

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

  All tests passed!

Change-Id: I9494f0750954e6364abb695aa867494669ae54c4
2019-02-19 14:52:18 -08:00
Aurimas Liutikas
1b693ea7df Migrate Messaging to androidx.
Test: make messaging
Bug: 76692459
Change-Id: I9103450622f129311545648ac75f5b2f9fc2d04a
Merged-In: I9103450622f129311545648ac75f5b2f9fc2d04a
2019-02-14 22:59:57 +00:00
calvinpan
7ea2a930be Migrate to TelephonyProvider new URI when query the current sim APN
Since MCC, MNC and MVNO is deprecated in the TelephonyProvider and
query based on SIM_APN_URI will return all matching APNs from current
subscription carrier, so migrate to the new URI.

Bug: 115709816
Test: Build pass.
Change-Id: I260f2da2677564f37ef6a7711d45040a61215ddc
Merged-In: I260f2da2677564f37ef6a7711d45040a61215ddc
2019-01-18 03:25:55 +00:00
calvinpan
7d0e40963a Migrate to TelephonyProvider new URI when query the current sim APN
Since MCC, MNC and MVNO is deprecated in the TelephonyProvider and
query based on SIM_APN_URI will return all matching APNs from current
subscription carrier, so migrate to the new URI.

Bug: 115709816
Test: Build pass.
Change-Id: I260f2da2677564f37ef6a7711d45040a61215ddc
2019-01-10 20:25:47 +08:00
Atanas Kirilov
dd1d5852f6 Merge changes from topic "am-d8363787-88bb-4e45-b57c-b18d9d8290cb" into oc-dev am: f7bdc8fd87 am: 24fba8cf55 am: 8f2f5671b0 am: dc683fa0fd
am: b6e222ec21

Change-Id: I1db1e411fcd7ee11dd7e8a0f345546ab2f75392a
2018-06-01 07:02:48 -07:00
Atanas Kirilov
dc683fa0fd Merge changes from topic "am-d8363787-88bb-4e45-b57c-b18d9d8290cb" into oc-dev am: f7bdc8fd87 am: 24fba8cf55
am: 8f2f5671b0

Change-Id: If409352ed52e8b4a1bf92b2bceedf5f032e8a7ed
2018-06-01 03:47:45 -07:00
Android Build Merger (Role)
870a173e43 [automerger] Messaging ignores file URIs shared via intent am: 9deefdf182 am: ea03db3303 am: cd77076596 am: 9c69271a58 am: 0c21193863
Change-Id: Ifd8f26ed2cfc372c039fffa192a49293f234890b
2018-05-25 23:24:07 +00:00
Android Build Merger (Role)
ea03db3303 [automerger] Messaging ignores file URIs shared via intent am: 9deefdf182
Change-Id: Ieaca25fa19b578953f88da445e2ecbd4b15f3a98
2018-05-25 23:24:03 +00:00
David Smith
9deefdf182 Messaging ignores file URIs shared via intent
Fixes b/37629504 by not creating attachments from file URIs shared via
intent. Sharing file URIs is disallowed by Android N and later and is no
longer supported for this app.

Test: manual using the Debug command added in this change

Change-Id: Ibff486c94ac703a9a4c5a80e33b934a460804a8f
Merged-In: Ibff486c94ac703a9a4c5a80e33b934a460804a8f
2018-05-25 23:24:02 +00:00
Aurimas Liutikas
f38a1bdc3c Migrate Messaging to androidx.
Test: make messaging
Bug: 76692459
Change-Id: I9103450622f129311545648ac75f5b2f9fc2d04a
2018-04-09 17:17:41 -07:00
Vasu Nori
49d1460b97 putback go/ag/3671714.
Enable content observer notifications even for default SMS app, when the
build is for Android Auto

Bug: 71633682
Test: tested manually
Change-Id: If91f4f7b2a9b46cba4aa516304f0007a06852c50
2018-02-28 16:25:02 -08:00
Vasu Nori
871938aa2c Revert "Enable content observer notifications even for default SMS app, when the"
This reverts commit 2e0bf0af27.

Reason for revert: should not be in P

Change-Id: I457ebe79e66abb21a9d2fc1c168802b8505c5e9f
2018-02-28 17:34:49 +00:00
Vasu Nori
2e0bf0af27 Enable content observer notifications even for default SMS app, when the
build is for Android Auto

Bug: 71633682
Test: tested manually
Change-Id: Iee139fd7a65f60cd6c059f5c6d2ef78464e0dfce
2018-02-15 16:00:01 -08:00
Tom Taylor
467361dbcf 37742976 - Catch bad gifs
* A security researcher crafted a gif that would cause the Android
Bitmap code to throw an NPE. That would cause messaging to crash when
decoding the NPE. The frameworks team is changing the underlying code to
throw an OutOfMemoryError instead of a NullPointerException.
In order to catch both errors, the code needs to catch Throwable.

Test: I added code to GifImageResource.getDrawable to throw a new
OutOfMemoryError and then used the debugger to verify it was caught by the
new catch Throwable statement. I did the same test with NullPointerException.
I tested attaching gif images and sending them to verify the gif path still
worked.

BUG=37742976

Change-Id: If71a7e65f8c0b083fe6c4b79f78358666338d59d
2017-10-05 11:27:21 -07:00
Tom Taylor
c12af8d012 37742976 - Catch bad gifs am: e0f247e399 am: 7c28ca34ec am: 22bbfd7360 am: 7a6b99a4a4 am: 6ea30b87b1 am: a072033ce4 am: 93d52cb5e2 am: cbed68f73b
am: f9b9dc3d2f

Change-Id: Ica8bedeb18ee6604e1382f54f0ad910b7cfa8c40
2017-07-12 19:20:09 +00:00