Commit Graph

91 Commits

Author SHA1 Message Date
Chen Xu
c0fa362e1b Merge "remove API RoleManager.getFinancialSms" 2019-12-14 06:57:48 +00:00
Chen Xu
435d1c1a53 remove API RoleManager.getFinancialSms
getFinancialSms is not functional and not used today, thus
remove it to avoid future confusion

Bug: 138745655
Bug: 140908357
Test: atest android.telephony.cts.SmsManagerTest
Change-Id: Ib57d0fc189b6c894227894ee02b592f7ee46f22f
(cherry picked from commit d6b2673181)
Merged-in: Ib57d0fc189b6c894227894ee02b592f7ee46f22f
2019-12-13 20:48:41 -08:00
Chen Xu
125e446c18 use SmsCbMessage.MESSAGE_FORMAT_3GPP to replace hidden SmsMgr APIs
Bug: 135956699
Test: unit test
Change-Id: Id631875ba6639ebf4fa569696a982c49d9c93e8f
(cherry picked from commit dd79281f97)
Merged-in: Id631875ba6639ebf4fa569696a982c49d9c93e8f
2019-12-13 16:48:29 -08:00
Taesu Lee
8aa8783143 Remove unnecessary calling getApplicationContex()
TODO: remove context argument from sendMultimediaMessage() and
downloadMultimediaMessage()
Test: build

Change-Id: Ief203065eb713cec200dbbc5ee9fd09825980d1b
Signed-off-by: Taesu Lee <taesu82.lee@samsung.com>
2019-11-15 16:22:50 +09:00
Treehugger Robot
f363f3549e Merge "Add new SystemApi methods for mainline" 2019-11-08 15:46:53 +00:00
Hall Liu
d2f962a6db Add new SystemApi methods for mainline
Add new SystemApi methods for Telecom to call in lieu of the old @hide
methods. Also moved CallerInfo and CallerInfoAsyncQuery to Telecom
because there are no more users in Telephony.

Bug: 141576016
Test: CTS
Change-Id: I458ba6bcfc03db72c0419b0cab2f0d0adfa971d4
Merged-In: I458ba6bcfc03db72c0419b0cab2f0d0adfa971d4
2019-11-07 17:22:28 -08:00
Tom Taylor
4471d28a9f Add new result codes
Test: manually tested sending and receiving sms

Bug: 135755360

Merged-In: I711e86eb5a31902ba5b2e1b6df444b009aef2727
Change-Id: I711e86eb5a31902ba5b2e1b6df444b009aef2727
2019-11-06 10:33:33 -08:00
Amit Mahajan
8b47b32246 Merge "Remove unused @hide APIs from SmsManager." 2019-11-01 22:48:49 +00:00
Amit Mahajan
be576379c0 Move getMmsConfig from SmsManager to MmsService.
Test: basic sanity
Bug: 140763963
Merged-in: If0a4b319f23d1a01e98f64ed1ae6eb6b90ccb02a
Change-Id: If0a4b319f23d1a01e98f64ed1ae6eb6b90ccb02a
(cherry picked from commit 214f7ec7fa)
2019-11-01 14:15:13 -07:00
Amit Mahajan
a25bc11b28 Remove unused @hide APIs from SmsManager.
Also created a new MmsManager and moved imms APIs there. Will
make MmsManager @SystemApi in a later CL.

Test: basic sanity
Bug: 140763963
Merged-in: If22a85887c1aae0ab80562d58bc08c6965fd470f
Change-Id: If22a85887c1aae0ab80562d58bc08c6965fd470f
(cherry picked from commit 24c01a2f79)
2019-11-01 14:00:38 -07:00
Taesu Lee
f7488d0874 New APIs for SMSC address
Added getSmscAddress() and setSmscAddress() to access SMSC address in
(U)SIM through the SmsManager.
getSmscAddress() requires that the calling app is the default SMS app,
or has READ_PRIVILEGED_PHONE_STATE or the carrier privileges.
setSmscAddress() requires that the calling app is the default SMS app,
or has MODIFY_PHONE_STATE or the carrier privileges.

Test: Manual

Change-Id: Icb21aff450f71b30ef6a1181834014bf7b85b8e1
Signed-off-by: Taesu Lee <taesu82.lee@samsung.com>
2019-10-31 10:14:56 +09:00
Brad Ebinger
50c7b1bedf Fix annotations in ImsSmsImplBase
Bug: 141568452
Test: manual
Change-Id: Iad595b75d47dc9fd356e6362e3adbcb5815e375d
2019-10-10 13:25:03 -07:00
Jordan Liu
d41a61df80 Merge "Change CellBroadcast APIs to SystemApi"
am: 82454e029f

Change-Id: Ic39446ab84f910b0f5225ad42f061e2a525ec868
2019-09-03 13:52:14 -07:00
Jordan Liu
e4141f0e8b Change CellBroadcast APIs to SystemApi
Bug: 135956699
Test: atest SmsManagerPermissionTest
Change-Id: Ibbb22505a80567d1c08cffe9b7a7fdbd10890abe
Merged-In: Ibbb22505a80567d1c08cffe9b7a7fdbd10890abe
2019-09-03 11:32:58 -07:00
Taesu Lee
aa27371a71 Merge "No need PDU data for deleteMessageFromIcc()"
am: 0280bd3970

Change-Id: Ida80e7e57477eb13a7d999ab589fef8e1139acb7
2019-08-28 01:27:10 -07:00
Taesu Lee
265dc5bce2 No need PDU data for deleteMessageFromIcc()
Test: Manual

Change-Id: I5a64546cb9da57c039c7c86768f3710a1874220d
Signed-off-by: Taesu Lee <taesu82.lee@samsung.com>
2019-08-26 16:11:17 +09:00
chen xu
0276e13b96 move short code definitions to SmsManager Test API
Bug: 127560420
Test: cts
Change-Id: I6a5ba2439713105b25913ba8eb081abfaafd1a2e
(cherry picked from commit 9c7fad9235)
Merged-in: I6a5ba2439713105b25913ba8eb081abfaafd1a2e
2019-06-24 21:12:48 +00:00
Amit Mahajan
15fbc62662 Avoid UnsupportedOperationException from getDefaultSmsSubscriptionId()
This is basically reverting to earlier behavior.

Test: basic sanity
Bug: 134375393
Merged-in: I44dc66f9f3d5d4dfcab95220d7a6a6be0ed5a825
Change-Id: I44dc66f9f3d5d4dfcab95220d7a6a6be0ed5a825
(cherry picked from commit 900aad9924)
2019-06-13 14:31:19 -07:00
Amit Mahajan
2bc637ecb9 Fix the default sub id returned by SmsManager.
SmsManager.getDefaultSmsSubscriptionId() did not handle the case
of no default set with a single SIM present. This CL adds the
handling for that.

Test: manual SMS sanity on single sim and DSDS devices
Bug: 132259056
Merged-in: I72ee7af9f0b2662e1ac26b7d3db60c667d06c471
Change-Id: I72ee7af9f0b2662e1ac26b7d3db60c667d06c471
(cherry picked from commit 1c0a7a16c1)
2019-06-13 14:30:40 -07:00
Brad Ebinger
05f4ff0a95 Trampoline SMS disambig dialog to Telephony
SmsManager used to display a "select default SMS
subscription" dialog every time SmsManager was used
and no default SMS subscription was set. This change
fixes the following issues:
1_ getSubscriptionId no longer pops up a disambig
dialog.
2) The disambig dialog no longer sets the
default, rather it waits for the response from the
user and performs the operation when it receives
a response.
2a) Dialogs can no longer be created from background
services, so we now have a restriction that if
the disambig dialog is shown via a background service,
we will use phone 0 as default (backwards compat for
apps targeting <Q) or fail (on apps targeting Q+).
3) If there is only one active subscription, use that
to perform the operation on MSIM devices instead of
asking and only displaying the one active subscription.
4) Certain non "user-facing" APIs that are used by
carrier apps no longer will pop up a UI.

Bug: 131713446
Bug: 130853716
Bug: 129141025

Test: run SmsManagerTestApp; atest TelephonyFrameworksTests

Merged-In: Ibbc07c961f1bdc19e1015885487e9f7b6a14fa83
Change-Id: I6be1c6d7bf6b6ee614b6a7d0369147e3b1890588
2019-06-13 18:30:14 +00:00
Brad Ebinger
26b242f75e No longer show disambig when calling SmsManager#getSubId
SmsManager#getSubId used to show a disambig dialog to
pick a default SMS subscription when
SmsManager#getSubscriptionId was called. Since it was used
internally as well, it would cause many of these dialogs
to pop up over and over again.

Do not display the dialog anymore and instead move the
dialog pop up to the methods that actually require the use
of the dialog, such as sending a text.

Bug: 130853716
Test: Manual, Default SMS app
Merged-In: Ibbc07c961f1bdc19e1015885487e9f7b6a14fa83
Change-Id: I71ad38f76750c750b149e4cdcb6fcf99ed89212e
2019-06-13 18:29:59 +00:00
Amit Mahajan
900aad9924 Avoid UnsupportedOperationException from getDefaultSmsSubscriptionId()
This is basically reverting to earlier behavior.

Test: basic sanity
Bug: 134375393
Change-Id: I44dc66f9f3d5d4dfcab95220d7a6a6be0ed5a825
2019-06-07 10:40:09 -07:00
Amit Mahajan
1c0a7a16c1 Fix the default sub id returned by SmsManager.
SmsManager.getDefaultSmsSubscriptionId() did not handle the case
of no default set with a single SIM present. This CL adds the
handling for that.

Test: manual SMS sanity on single sim and DSDS devices
Bug: 132259056
Change-Id: I72ee7af9f0b2662e1ac26b7d3db60c667d06c471
2019-05-21 13:21:03 -07:00
Taesu Lee
98d41e6917 Divide a message text into correctly sized parts
Message format info is required in order to divide a message text into
correctly sized parts on a device that supports for both 3GPP and 3GPP2
formats in multi-sim. And fixed to get default SMS subId from SmsManager
in SmsMessage class instead.

Test: Manual
Bug: 132259056
Merged-in: Id2512eb62504b7e789f58b7d9697009d565c4a18
Change-Id: Id2512eb62504b7e789f58b7d9697009d565c4a18
Signed-off-by: Taesu Lee <taesu82.lee@samsung.com>
(cherry picked from commit 8debeeb126)
2019-05-21 10:32:59 -07:00
Taesu Lee
8debeeb126 Divide a message text into correctly sized parts
Message format info is required in order to divide a message text into
correctly sized parts on a device that supports for both 3GPP and 3GPP2
formats in multi-sim. And fixed to get default SMS subId from SmsManager
in SmsMessage class instead.

Test: Manual

Change-Id: Id2512eb62504b7e789f58b7d9697009d565c4a18
Signed-off-by: Taesu Lee <taesu82.lee@samsung.com>
2019-05-21 07:55:14 +09:00
Xin Li
c76d117d2a DO NOT MERGE - Merge pi-platform-release (PPRL.190505.001) into stage-aosp-master
Bug: 132622481
Change-Id: I7ba1a9999b3a9bac8031dd086fa2632e45404f32
2019-05-15 11:31:45 -07:00
Brad Ebinger
360415aa13 Trampoline SMS disambig dialog to Telephony
SmsManager used to display a "select default SMS
subscription" dialog every time SmsManager was used
and no default SMS subscription was set. This change
fixes the following issues:
1_ getSubscriptionId no longer pops up a disambig
dialog.
2) The disambig dialog no longer sets the
default, rather it waits for the response from the
user and performs the operation when it receives
a response.
2a) Dialogs can no longer be created from background
services, so we now have a restriction that if
the disambig dialog is shown via a background service,
we will use phone 0 as default (backwards compat for
apps targeting <Q) or fail (on apps targeting Q+).
3) If there is only one active subscription, use that
to perform the operation on MSIM devices instead of
asking and only displaying the one active subscription.
4) Certain non "user-facing" APIs that are used by
carrier apps no longer will pop up a UI.

Bug: 131713446
Bug: 130853716
Bug: 129141025

Test: run SmsManagerTestApp; atest TelephonyFrameworksTests

Change-Id: I6be1c6d7bf6b6ee614b6a7d0369147e3b1890588
2019-05-10 00:14:23 +00:00
Brad Ebinger
fa82dddcf6 No longer show disambig when calling SmsManager#getSubId
SmsManager#getSubId used to show a disambig dialog to
pick a default SMS subscription when
SmsManager#getSubscriptionId was called. Since it was used
internally as well, it would cause many of these dialogs
to pop up over and over again.

Do not display the dialog anymore and instead move the
dialog pop up to the methods that actually require the use
of the dialog, such as sending a text.

Bug: 130853716
Test: Manual, Default SMS app
Change-Id: I71ad38f76750c750b149e4cdcb6fcf99ed89212e
2019-05-07 23:09:50 +00:00
Youming Ye
35c8488104 Pass in external packageName
Use external packageName when ActivityThread couldn't get calling package
due to calling identity cleaned.

Bug: 131287254
Test: Manual
Change-Id: Icec3ad7193bc5988799188a7a1e68aebc0dc109d
2019-05-03 15:09:49 -07:00
Youming Ye
e1530797d5 Pass in external packageName
Use external packageName when ActivityThread couldn't get calling package
due to calling identity cleaned.

Bug: 131287254
Test: Manual
Change-Id: Icec3ad7193bc5988799188a7a1e68aebc0dc109d
2019-05-02 15:45:12 -07:00
Brad Ebinger
440d168834 Merge "Do not show SMS SIM pick UI for Cell Broadcast Config change" am: 4ae4e50def am: f15dabde00
am: 511f86aa55

Change-Id: Id46383f86fe31460d8fde22e5e572e016e065fb7
2019-03-29 17:19:04 -07:00
Brad Ebinger
099d985844 Do not show SMS SIM pick UI for Cell Broadcast Config change
If the user did not pick their default SIM subscription for
SMS, we were showing many dialogs to the user whenever
SmsManager#getSubscriptionId was called for cell broadcast
related APIs.

Instead, if we instantiate the SmsManager using
SmsManager.getDefault() and the user has not set a default,
use the default Phone and do not show SIM picker activity
(consistent with legacy implementation).

Bug: 129315610
Test: set up DSDS, disable eSIM operator in settings
Change-Id: I3cc4839632eede75c8943836432b07978d0efda0
2019-03-29 13:23:11 -07:00
Hayden Gomes
587d3691d6 Merge "Moving BT SMS logic to internal telephony" am: 2b7db36a14 am: a75c1cdc4d
am: 65031370d1

Change-Id: Ied62479bdec70dbb3527aa79a64ce9b250fc1454
2019-03-27 12:32:25 -07:00
chen xu
9c7fad9235 move short code definitions to SmsManager Test API
Bug: 127560420
Test: cts
Change-Id: I6a5ba2439713105b25913ba8eb081abfaafd1a2e
2019-03-25 21:51:26 -07:00
Hayden Gomes
7a3d8a4f00 Moving BT SMS logic to internal telephony
- Move Bluetooth SMS logic to BtSmsInterfaceManager
- Move subscription check to SmsController

Bug: 127331685
Test: Manually sent SMS through connected bluetooth device
Change-Id: Icb0fc1cc8339ec3f0b5402ea9b8e15650d8972e5
2019-03-22 08:34:19 -07:00
Brad Ebinger
dea151c2c6 Merge "Fix NPE in SmsManager and keep existing behavior" am: 8b95375a4a am: 43663aa497
am: 44c64ec0a3

Change-Id: I874c83a71768fb8bbd0614979fc9520521a80a23
2019-03-08 07:15:24 -08:00
Brad Ebinger
e6de81fd25 Fix NPE in SmsManager and keep existing behavior
The behavior of SmsManager#sendTextMessage changed,
we are blocking the sending of the SMS if there were no
subscriptions (i.e. no SIM scenario). This change
accidently introduced a NPE scenario in some cases.

Fixed NPE and removed SMS blocking code in SmsManager
to keep existing functionality the same.

Bug: 127338050
Test: atest GtsTelephonyTestCases
Change-Id: I71eefbc8e1619701e1b1d7b12c3c080c4ef376ef
2019-03-06 15:35:04 -08:00
allenwtsu
f636191bea DO NOT MERGE Add CarrierConfig to overlay incorrect country ISO
The issues happens when CDMA is roaming to GSM, some US operator's mcc/mnc would change to 204/04
whose country belongs to NL not US. It doesn't always change but error occurs once changed.
MMSService would check if locale matches with phoneNumber.
The error results in HTTP header bringing incorrect MDN to server.
In Q, AOSP fixes it by using CarrierConfig to enforce 'US' as iso-country for all error scenarios.
Since the change is great, migrating all the patches to P for the time being is risky.
So, we use the same CarrierConfig as Q and narrow the range to MMS only.
That's why we use "DO NOT MERGE".

Bug: 120448454
Bug: 122332763
Test: Build pass
Change-Id: I74a7be348f37c06c015c50f96fbcf7db4fb15246
2019-01-31 06:54:33 +00:00
Hongming Jin
08496b0e98 Add API in SmsManager to return sms messages for financial app.
Test: atest android.telephony.cts.SmsManagerTest
Bug: 111207447
Change-Id: I1571cb005f7c1374a9acbec27041bca291fa7153
2019-01-26 14:26:47 -08:00
Hongming Jin
46edf1506d Add API to SmsManager to allow apps to authenticate user account through
sms without requesting sms permissions.

Bug: 111210542
Test: atest android.telephony.cts.SmsManagerTest
Change-Id: I9b176032d7b2bf578dd1a64745bf4a1e13008a7a
2019-01-25 15:24:29 -08:00
Vasu Nori
aea0391cf6 Implementation of Remote-SIM.
Design doc http://shortn/_GG690j15js

1. Modified SmsManager to send message thru Bluetooth if the subscription
   is for a Remote-SIM.
2. Added new column 'subscriptionType' to SubscriptionInfo.
3. SubscriptionManager:
  a. Added new constants for Local SIM and Remote SIM
  b. Added hidden APIs to add/remove Remote SIM subscriptions

Bug: 112321331
Test: tested manually and w/ unittests
Change-Id: Ib15553a806691a258fc00f7aaf812b8a9d49c2e9
2019-01-23 14:25:32 -08:00
Mathew Inwood
55418eada5 Limit access to suspected false positives.
Members modified herein are suspected to be false positives: i.e. things
that were added to the greylist in P, but subsequent data analysis
suggests that they are not, in fact, used after all.

Add a maxTargetSdk=P to these APIs. This is lower-risk that simply
removing these things from the greylist, as none of out data sources are
perfect nor complete.

For APIs that are not supported yet by annotations, move them to
hiddenapi-greylist-max-p.txt instead which has the same effect.

Exempted-From-Owner-Approval: Automatic changes to the codebase
affecting only @UnsupportedAppUsage annotations, themselves added
without requiring owners approval earlier.

Bug: 115609023
Test: m
Change-Id: Ia937d8c41512e7f1b6e7f67b9104c1878b5cc3a0
Merged-In: I020a9c09672ebcae64c5357abc4993e07e744687
2018-12-28 14:26:35 +00:00
Adrian Roos
6115769c16 API: Clean up redundant and ineffective usages of SystemApi and TestApi
Everything that is marked SystemApi or TestApi, but not @hide is still
part of the public SDK, it is therefore not sound to have that combination.

In the future, specifing such a combination will be considered an error
to prevent inadvertently exposing SystemApi and TestApi as public API.

Bug: 115333477
Change-Id: Ibd5d6a22862fdbc1e20a1cb3925280f5a682edea
Merged-In: Ibd5d6a22862fdbc1e20a1cb3925280f5a682edea
Test: METALAVA_PREPEND_ARGS="--error UnhiddenSystemApi" m checkapi
Exempt-From-Owner-Approval: API cleanup
2018-12-12 15:02:26 +01:00
Mathew Inwood
a838206e94 Add @UnsupportedAppUsage annotations
For packages:
  android.telephony
  android.telephony.cdma
  android.telephony.data
  android.telephony.euicc
  android.telephony.gsm
  android.telephony.ims
  android.telephony.ims.aidl
  android.telephony.ims.compat
  android.telephony.ims.compat.feature
  android.telephony.ims.compat.stub
  android.telephony.ims.feature
  android.telephony.ims.stub
  android.telephony.mbms
  android.telephony.mbms.vendor

This is an automatically generated CL. See go/UnsupportedAppUsage
for more details.

Exempted-From-Owner-Approval: Mechanical changes to the codebase
which have been approved by Android API council and announced on
android-eng@

Bug: 110868826
Test: m
Change-Id: I02d900d6d0ec9a6b2172a71911fec61d04e4d235
Merged-In: I22547ac0ed384d74d61cfd51d20c140e392a597f
2018-08-23 09:37:53 +01:00
Hall Liu
b29e727b32 Merge "Pass correct parameters to API sendMultipartTextMessage" 2018-08-21 22:27:27 +00:00
Mengjun Leng
353bed1155 Pass correct parameters to API sendMultipartTextMessage
1. Pass parameter priority, expectMore and validityPeriod
to API sendMultipartTextMessage.

2. Modify validity check algrithm for parameter priority and
validityPeriod, so that avoids the exception for invalid inputs.

Bug: 112013111

Change-Id: I7a90db6e427b3daf6589e6a2b6dad2c4b3458832
2018-07-31 15:38:07 +08:00
Jeff Davidson
1ba1839bd8 Expose remaining READ_PHONE_STATE and SEND_SMS APIs to carrier apps.
Bug: 70177947
Bug: 70041899
Test: Flash / boot; TreeHugger; Unit/CTS tests in topic
Merged-In: I4061becb1d7ceaa58d84e4e3568c1b6e63cfc8d1
Change-Id: I4061becb1d7ceaa58d84e4e3568c1b6e63cfc8d1
2018-03-19 18:48:11 -07:00
Jeff Davidson
a4a4c8aea7 Expose remaining READ_PHONE_STATE and SEND_SMS APIs to carrier apps.
Bug: 70177947
Bug: 70041899
Test: Flash / boot; TreeHugger; Unit/CTS tests in topic
Change-Id: I4061becb1d7ceaa58d84e4e3568c1b6e63cfc8d1
2018-03-16 23:27:10 +00:00
Jayachandran Chinnakkannu
85ef115e72 Merge "Add support for sending message with priority, link control and validity period options" am: b103f9309b am: bb29858d7f
am: 0000a9b623

Change-Id: I5da271b0f113844b7ad393a051078af602fa518d
2018-02-27 00:53:32 +00:00
Mengjun Leng
b379ce981b Add support for sending message with priority, link control and validity period options
1. Added support for message priority(indicates the priority of a
   SMS to the network in the PDU) in 3gpp2
2. Added support for link control(indicates whether network can
   expect more messages or not so it can decide whether to retain
   the radio link or not) while sending multiple messages
3. Added support for validity period(indicates how much time the
   SMS is valid at the SMSC) support in 3gpp
4. Amended UT test cases for API changes and add UT validity period
   test case

Test: Verfied sending short SMS, long SMS, MMS, SMS with emoji on
      live network

Bug: 34962629
2018-02-24 01:14:03 +00:00