Commit Graph

3840 Commits

Author SHA1 Message Date
Hunter Knepshield
c3b90ecd40 Merge "Check Carrier Privilege on Hidden Subs" into qt-r1-dev
am: 4c452a6534

Change-Id: Ic5baff7a7530d473e6f78899442f6834df33cb3b
2019-07-12 11:33:37 -07:00
TreeHugger Robot
4c452a6534 Merge "Check Carrier Privilege on Hidden Subs" into qt-r1-dev 2019-07-12 18:00:48 +00:00
Xiangyu/Malcolm Chen
dbb897ee22 Merge changes from topic "135105735" into qt-r1-dev
am: 896cdfa547

Change-Id: Ie661fdc8a29645fa1b319cf1db8a896a8d21deae
2019-07-12 10:43:52 -07:00
Jordan Liu
44f9007474 Merge "Use TM SubId in getDataState and getDataActivity" am: 3968a18c27 am: 6ef6ff9ca1
am: 853c565de9

Change-Id: I450f32dbe6ce710afaf81950bcf5b683d2b479a6
2019-07-11 18:50:25 -07:00
Jordan Liu
853c565de9 Merge "Use TM SubId in getDataState and getDataActivity" am: 3968a18c27
am: 6ef6ff9ca1

Change-Id: I547a76c5da5f1ce58ed77853591ec1d4ba8f9318
2019-07-11 18:39:58 -07: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
Malcolm Chen
ac56a4254e Provide @hide API to return merged IMSIs from grouping.
Bug: 135105735
Test: test app. Apply grouping and call the new API, to make sure
it returns correct values.

Change-Id: I99586976d3421d4b35be465201ee33cbb2dfd1d9
2019-07-11 13:19:36 -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
Hunter Knepshield
b26cbbd53d Check Carrier Privilege on Hidden Subs
When calling CheckCarrierPrivilegeForAnySubId the
hidden subscriptions were not being taken into account
due to getAllActiveSubscriptionIds being a public method
that intentionally ignores hidden subscriptions.

NOTE: This is identical to ag/8193293, except that the
SubscriptionManager modifications don't make
getActiveSubscriptionIdList() static (it was causing test failures). A
further bug can be pursued to make everything static all at once.

Bug: 135684437
Test: manual
Change-Id: Iad6a3c2635e5eac2d33a16aa460b98394fd817f4
2019-07-10 13:14:44 -07:00
Eugene Susla
6e7bb1e7cf Merge "Fix sms app changed broadcast" into qt-dev am: 0a98e4b693
am: e5c5ec7316

Change-Id: Id0142e70768afdc4ae02f8c2f97137e984b563a7
2019-07-03 16:52:44 -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
cbdc139229 Merge "Fix sms app changed broadcast" into qt-dev
am: 0a98e4b693

Change-Id: Ic2ab525c22b17afc97b5220a8c5b4ddd18db225b
2019-07-03 16:32:01 -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
Jordan Liu
d521d87d45 Merge "Revert "Check Carrier Privilege on Hidden Subs"" into qt-r1-dev
am: 85a55afa3e

Change-Id: Iefbc1fe1cb0967703a897068f433517108f087a0
2019-07-01 20:30:50 -07:00
TreeHugger Robot
85a55afa3e Merge "Revert "Check Carrier Privilege on Hidden Subs"" into qt-r1-dev 2019-07-02 02:11:37 +00:00
Nazanin Bakhshi
1ca89a995b Merge "Add device identifier permission checks to TelephonyPermissions" 2019-07-01 23:26:18 +00:00
Jordan Liu
3c41bb707b Revert "Check Carrier Privilege on Hidden Subs"
This reverts commit 6fc804b3f9.

Reason for revert: causes test failures b/136421546

Change-Id: I3b1dcd78aea6beeadb82626145e868954286bbee
2019-07-01 23:03:50 +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
00cf005bd1 Merge "Check Carrier Privilege on Hidden Subs" into qt-r1-dev
am: 09ef9e13a7

Change-Id: Ibb3792dfc28f93dfe96ea67367963b115dbff155
2019-06-28 23:22:35 -07:00
Nathan Harold
09ef9e13a7 Merge "Check Carrier Privilege on Hidden Subs" into qt-r1-dev 2019-06-29 06:07:52 +00:00
Nathan Harold
3b0cf87a5b Merge "Revert "Use TM SubId in getDataState and getDataActivity"" am: 4d4e2474ea am: f5ee9c61be
am: 22d0ed63cc

Change-Id: Ibb0e9d7f55c8f1ba6179e7afbd63e33c23628822
2019-06-27 16:06:15 -07:00
Nathan Harold
6fc804b3f9 Check Carrier Privilege on Hidden Subs
When calling CheckCarrierPrivilegeForAnySubId the
hidden subscriptions were not being taken into account
due to getAllActiveSubscriptionIds being a public method
that intentionally ignores hidden subscriptions.

Bug: 135684437
Test: manual
Change-Id: I7688e4fe25fd2c6ed22dc8edc508345c1a3d447c
2019-06-27 16:02:35 -07: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
Andy Chou
4143d9693b Merge "Notify physical channel configuration with phoneId and subId" into qt-r1-dev
am: a96ab85260

Change-Id: Ibb272d712a4a5a691bd0a0b20d6426229a5f355c
2019-06-25 18:51:29 -07:00
Andy Chou
a96ab85260 Merge "Notify physical channel configuration with phoneId and subId" into qt-r1-dev 2019-06-26 01:24:46 +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
andychou
ce65922c73 Notify physical channel configuration with phoneId and subId
Physical channel configuration may be retrieved before SIM loaded. So
configuration will not be able to report via TelephonyRegistry.
Therefore, use phoneId to mapping record and notify

Bug: 123904518
Test: Manual test and make sure physical channel configuration is
displayed in RadioInfo

Change-Id: I11c89b9cf68c3f3d7523ad8dfc21520f44fa7ce3
2019-06-25 17:57:29 +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
faf3e373db Merge "Remove settings to relax device ID access restrictions" into qt-dev
am: 692a68133b

Change-Id: I3312fae325c593aef750c80cbd4365dfd2669f6c
2019-06-12 14:20:22 -07:00