Commit Graph

3823 Commits

Author SHA1 Message Date
TreeHugger Robot
c64852517a Merge "DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5713463) into stage-aosp-master" into stage-aosp-master 2019-08-15 23:02:12 +00:00
satayev
4a607da02b Merge "Move telephony/cdma/ classes into appropriate package."
am: 46c04b7bb8

Change-Id: I1fb05b0e09c492fa95af92e6b146364492177f61
2019-08-15 13:18:41 -07:00
Xin Li
80860803a4 DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5713463) into stage-aosp-master
Bug: 134405016
Change-Id: I303c0268e8e454b0f0f460eb286812a50c9add88
2019-08-14 12:04:06 -07:00
Artur Satayev
f772c13f9d Move telephony/cdma/ classes into appropriate package.
Not changing the java packages, but rather moving the source location. This allows running metalava on them.

Test: m
Change-Id: I3b46644361239d85818dd885f461dfc94de49dca
2019-08-14 10:48:10 +01:00
Jordan Liu
6ef6ff9ca1 Merge "Use TM SubId in getDataState and getDataActivity"
am: 3968a18c27

Change-Id: I69e39b4867b78182217357d14ef96c966e3b7dd3
2019-07-11 18:30:26 -07:00
Nathan Harold
af984d0d4e Use TM SubId in getDataState and getDataActivity
-Update getDataState() API to use the SubId specified
 by the TelephonyManager instance.

-Update the getDataActivity() API to use the SubId
 specified by the TelephonyManager instance.

(This CL is an un-revert of aosp/984377)

Bug: 135205433
Test: manual (automated test is infeasible)
Change-Id: I035f2c44a7955e88608b1c336acb72fb68c3e450
2019-07-11 11:52:55 -07:00
Eugene Susla
e5c5ec7316 Merge "Fix sms app changed broadcast" into qt-dev
am: 0a98e4b693

Change-Id: I6223c8373f8e00446f5c7c51496bbacff6483be5
2019-07-03 16:32:02 -07:00
Eugene Susla
0fa8049fe8 Fix sms app changed broadcast
Fixes: 136257475
Test: switch sms holder in settings, and ensure ceceived broadcasts for both
becoming and leaving the sms app status
Change-Id: I10dda3fd8ebd38ab12bdb8192ed4f3863f4238b8
2019-07-02 11:06:26 -07:00
Nazanin Bakhshi
1ca89a995b Merge "Add device identifier permission checks to TelephonyPermissions" 2019-07-01 23:26:18 +00:00
Michael Groover
94672cea7c Add device identifier permission checks to TelephonyPermissions
Bug: 131916175
Fixes: 136305129
Test: atest PhoneSubInfoControllerTest
Change-Id: Icca98347ab76b7c3468b95756a33a758a3abde37
Merged-In: I3c82c53ec89cd17b34a61166ccc9e9747388efac
2019-07-01 17:53:11 +00:00
Nathan Harold
22d0ed63cc Merge "Revert "Use TM SubId in getDataState and getDataActivity"" am: 4d4e2474ea
am: f5ee9c61be

Change-Id: I3a1ffa493f8b11cdd7c8bfff4fa4f8d78d54a169
2019-06-27 15:46:06 -07:00
Nathan Harold
4d4e2474ea Merge "Revert "Use TM SubId in getDataState and getDataActivity"" 2019-06-27 22:11:18 +00:00
Nathan Harold
44173ee7b0 Revert "Use TM SubId in getDataState and getDataActivity"
This reverts commit b2ab846cf4.

Reason for revert: Decision has been made to keep the unsupported AIDL API.

Change-Id: I31219606974019ac46da789ec31ca9cb3a86eb13
2019-06-26 00:41:00 +00:00
Chen Xu
b6399511f8 Merge "move short code definitions to SmsManager Test API" 2019-06-25 17:18:46 +00:00
Neil Fuller
f28ebce301 Merge "Migrate telephony code away from Time" am: b8bdc72174
am: ae2f34462a

Change-Id: I83631d058eab50374e9f4a7a8d4fc9d1453f285d
2019-06-25 02:17:11 -07:00
Neil Fuller
b8bdc72174 Merge "Migrate telephony code away from Time" 2019-06-25 08:48:17 +00:00
Steven Moreland
31bfec7f19 Merge "Remove obsolete reference to ServiceManagerNative." am: f961b9632f
am: 045d5884fe

Change-Id: I434212fe15be9b6ed1abde556718c08eb552709a
2019-06-24 14:44:53 -07: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
Steven Moreland
f961b9632f Merge "Remove obsolete reference to ServiceManagerNative." 2019-06-24 18:02:34 +00:00
Amit Mahajan
3d5285c16b Merge "Set mOriginatingAddress and mRecipientAddress separately" am: 44ea78d8ff
am: ab90035993

Change-Id: I02833dfbb5af129f326370d9c09968f167fef19e
2019-06-21 16:46:15 -07:00
Steven Moreland
bb25d1aeba Remove obsolete reference to ServiceManagerNative.
ServiceManagerNative.getDefault doesn't exist.

Bug: 135768100
Test: N/A
Change-Id: I6e04b54c986c3d0997429a8d810f2554d84dc119
2019-06-21 16:41:50 -07:00
Amit Mahajan
44ea78d8ff Merge "Set mOriginatingAddress and mRecipientAddress separately" 2019-06-21 23:23:12 +00:00
Amit Mahajan
d364e2a7fb Merge "Replace the IDD with the '+' sign" am: 3fdedfab76
am: a187edb117

Change-Id: Idcd55e1c7f2a0d62ac3c966ebd1678450f173b9a
2019-06-21 10:23:14 -07:00
Amit Mahajan
3fdedfab76 Merge "Replace the IDD with the '+' sign" 2019-06-21 16:34:12 +00:00
Taesu Lee
da48fd8fc1 Set mOriginatingAddress and mRecipientAddress separately
Properly assign the address according to the parameters in the PDU for
3GPP2 SMS. mOriginatingAddress or mRecipientAddress should be used to
get the address according to the actual message type. And the destination
subaddress is added also.

Test: Manual

Change-Id: Ide734b7348ea5eb8cf460dac046e96609ed9d8b3
Signed-off-by: Taesu Lee <taesu82.lee@samsung.com>
2019-06-20 07:56:31 +09:00
Nathan Harold
c51d10eaef Merge "Use TM SubId in getDataState and getDataActivity" am: 28a7b5974d
am: 08698af50e

Change-Id: I6a4ea5cf947eb8145bbf31d807e76a64980b042e
2019-06-18 11:30:43 -07:00
Jack Yu
2bbd84cea3 Merge "Fixed tethering failed when device is on CBRS" am: fa9c857b21
am: df9fb2aae8

Change-Id: Ia75de613314fcf7ff764090c833c9f4b440db6f1
2019-06-17 23:09:07 -07:00
Nathan Harold
b2ab846cf4 Use TM SubId in getDataState and getDataActivity
-Update getDataState() API to use the SubId specified
 by the TelephonyManager instance.

-Update the getDataActivity() API to use the SubId
 specified by the TelephonyManager instance.

Bug: 135205433
Test: manual (automated test is infeasible)
Change-Id: Icf27eab40b1f979892123dc4185db2a138c1ffc2
2019-06-17 18:29:09 -07:00
Jack Yu
807a82b3aa Fixed tethering failed when device is on CBRS
Fixed by using the correct sub id for CBRS subscription

Bug: 133852860
Test: Manual
Merged-In: If01e17becce9684556345eb76512f617b9a9278c
Change-Id: If01e17becce9684556345eb76512f617b9a9278c
(cherry picked from commit a952d2018b)
2019-06-17 18:29:09 -07:00
Neil Fuller
c18b91b35e Migrate telephony code away from Time
Switch telephony code under frameworks/base/ away from
android.text.format.Time. Time uses 32-bit ints to represent
seconds from the start of the Unix epoch and therefore will
break in 2038. Moving to java.time types avoids this problem.

Bug: 16550209
Test: build / boot / treehugger
Change-Id: I49e748f686709c0c38aa5ba37b37ec4ed1e68b55
2019-06-17 20:19:14 +01:00
Taesu Lee
b17cdd14c1 Merge "Assume successful delivery if no Message Status" am: 94deb1ca38
am: 05d08d1a1e

Change-Id: Ibf823cc8bd8353940c0d238d3a398f68fa930d86
2019-06-13 17:26:55 -07:00
Treehugger Robot
94deb1ca38 Merge "Assume successful delivery if no Message Status" 2019-06-13 23:32:09 +00: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
Taesu Lee
f018547425 Assume successful delivery if no Message Status
It assumes ERROR_CLASS is ERROR_NONE and MSG_STATUS_CODE is
STATUS_DELIVERED if there is no Message Status subparameter in Delivery
Acknowledgment.

Test: Manual

Change-Id: If5660235ce2a6af84d03ec1367a8be5daee672d2
Signed-off-by: Taesu Lee <taesu82.lee@samsung.com>
2019-06-13 12:53:13 +09:00
Michael Groover
949e343a1c Merge "Remove settings to relax device ID access restrictions" into qt-dev
am: 692a68133b

Change-Id: I54d5aba18bc6925273668b3a9b940445d6a2a4ca
2019-06-12 14:16:23 -07:00
Jack Yu
a726a48fcd Supported data enabled override for different scenarios
Added override rules support for always allowing mms and
internet data during voice call.

Test: Manual + unit tests
Bug: 132113695
Merged-In: I2266d7f428901ccbba6bf538a7c7696e6566b96c
Change-Id: I2266d7f428901ccbba6bf538a7c7696e6566b96c
(cherry picked from commit 0d26d718b3)
2019-06-07 14:47:13 -07:00
Michael Groover
44c92e0708 Remove settings to relax device ID access restrictions
Bug: 123937881
Test: atest TelephonyPermissionsTest
Change-Id: I6eb1920730a28d393cdbef06195f43da957338fd
2019-06-04 18:30:59 -07:00
chen xu
459e51e5ba skip permission check for TelephonyManager API getMmsUserAgent
Bug: 133637995
Test: Manual test
Change-Id: Ib9f211120c34e9b48c02f990088c32fb307a64f2
(cherry picked from commit 4878165365)
Merged-in: Ib9f211120c34e9b48c02f990088c32fb307a64f2
2019-06-04 18:13:32 +00:00
Ritwika Mitra
e46b018ed5 Merge "Initializing the Telephony Sms DB based on RoleManager.ROLE_SMS" into qt-dev
am: d1ca4823d5

Change-Id: I9191b12012caa00375f236c9cef086ac67c84b0d
2019-06-03 12:35:56 -07:00
Ritwika Mitra
19afd4690f Initializing the Telephony Sms DB based on RoleManager.ROLE_SMS
Fix: 133356079
Test: manual

Change-Id: I49dcdc450e1113ffae887ad488d39f74a96787ed
2019-06-03 10:42:43 -07:00
Nazanin Bakhshi
2822c25b89 Merge "Supported data enabled override for different scenarios" into qt-dev
am: 02e9e32b90

Change-Id: Ibf541df3b68f476257f79ff458b55edf0efba9db
2019-05-31 17:27:12 -07:00
Jack Yu
0d26d718b3 Supported data enabled override for different scenarios
Added override rules support for always allowing mms and
internet data during voice call.

Test: Manual + unit tests
Bug: 132113695
Change-Id: I2266d7f428901ccbba6bf538a7c7696e6566b96c
2019-05-31 11:06:15 -07:00
Chen Xu
7e5fa37b11 Merge "skip permission check for TelephonyManager API getMmsUserAgent" into qt-dev
am: 924c6eb536

Change-Id: Ibb34ee3980b10e5791c0239676d03c3b4304dfd8
2019-05-28 21:32:43 -07:00
chen xu
4878165365 skip permission check for TelephonyManager API getMmsUserAgent
Bug: 133637995
Test: Manual test
Change-Id: Ib9f211120c34e9b48c02f990088c32fb307a64f2
2019-05-28 15:38:54 -07:00
Taesu Lee
ee503e4c07 Replace the IDD with the '+' sign
It replaces the IDD in front of an address in 3GPP2 message with the '+'
to show as an international phone number format.

Test: Manual

Change-Id: I450b514bfd5d638ca886d8b64a6db45526f13fbf
Signed-off-by: Taesu Lee <taesu82.lee@samsung.com>
2019-05-24 11:13:21 +09:00
Amit Mahajan
3aa54b1fff Merge changes from topic "Correct subId in divideMessage()" into qt-dev
* changes:
  Fix the default sub id returned by SmsManager.
  Divide a message text into correctly sized parts
2019-05-23 16:42:19 +00:00
Nathan Harold
be113ab4aa Merge "Add permissions check for getNetworkType" into qt-dev
am: ecd1e039a3

Change-Id: I2bd909b7cf20c93047007fbce05f32049f5214b3
2019-05-22 19:32:35 -07:00
Nathan Harold
744b57e122 Add permissions check for getNetworkType
-Add a function in TelephonyPermissions to check
 READ_PHONE_STATE or return NETWORK_TYPE_UNKNOWN (soft denial).
-Honor the subId in TM or use the default DATA sub when
 returning the network type.

Bug: 132466954
Test: cts - atest TelephonyManagerPermissionTest
Merged-In: I4e1767c9dc10acbadec286512752d4bb52059b74
Change-Id: I4e1767c9dc10acbadec286512752d4bb52059b74
(cherry picked from commit 39444b39ba)
2019-05-22 13:44:24 -07:00
Amit Mahajan
2113c335ae Merge "Add comments for boolean parameters in translate()." am: a844340276
am: b404dada78

Change-Id: Ica548474dbb5ae9d70b8511f82273b8f9eab5349
2019-05-22 01:33:14 -07:00
Amit Mahajan
dd4b36a12c Add comments for boolean parameters in translate().
Test: none
Bug: 132259056
Change-Id: Ia57d8a81a980959ea1f79692501edd88a8bab273
2019-05-21 17:32:45 -07:00