Commit Graph

5286 Commits

Author SHA1 Message Date
Nathan Harold
7293d28543 Deprecate getNetworkType
This API is a functional duplicate of getDataNetworkType.

Bug: 132466954
Test: make update-api (docstring-only change)
Change-Id: I3a5ba3d601013bc9c97c6ea1732bfac21fce0dcd
2019-05-22 13:57:42 -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
Treehugger Robot
8f7157ca48 Merge "Divide a message text into correctly sized parts" 2019-05-21 05:25:39 +00:00
Nathan Harold
b846e3c100 Merge "Revert "Use the SubId in the TM.getNetworkType if Valid"" 2019-05-21 02:39:43 +00:00
Nathan Harold
7bc3d98515 Revert "Use the SubId in the TM.getNetworkType if Valid"
This reverts commit 0aca431313.

Reason for revert: 133129040

Change-Id: I9a974018d4155426b1050a4b80b82f4bf4a9d996
2019-05-20 23:21:02 +00: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
Leland Miller
c0c7806ec0 Merge "Add documentation for Conversation table" 2019-05-20 17:02:22 +00:00
Jack Yu
9e02ea4763 Merge "Fixed concurrent access network registration info" 2019-05-18 01:18:28 +00:00
Nathan Harold
06445094a9 Merge "Use the SubId in the TM.getNetworkType if Valid" 2019-05-18 00:25:42 +00:00
David Brazdil
52ad4f8e43 Merge "Change CellSignalStrengthGsm.mTimingAdvance to greylist-max-p" 2019-05-17 12:28:22 +00:00
Nathan Harold
0aca431313 Use the SubId in the TM.getNetworkType if Valid
If the TM instance has a specific subid that was
added using TM.createForSubscriptionId(), honor that
subId in getNetworkType().

Bug: 132466954
Test: compilation + manual
Change-Id: Ice4f673750ab3b374644750113e5b9b2a4f5ba63
2019-05-16 19:39:12 -07:00
Xin Li
3fd6ab8bb8 Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.190505.001) into master." 2019-05-17 00:58:07 +00:00
Gowroji Sunil
37ffaecd0e Add documentation for Conversation table
Test: None, documentation only.
Change-Id: I264c0e090f06914d60f3e08d9ea77a5a47763c1c
2019-05-17 00:03:33 +00:00
Jack Yu
aa77f3a308 Fixed concurrent access network registration info
Fixed by adding synchronization block for every place
accessing network registration info in service state.

Bug: 131883293
Test: Manual
Merged-In: Ic10931b7fab998bfebe09d316a2d87886222dae3
Change-Id: Ic10931b7fab998bfebe09d316a2d87886222dae3
(cherry picked from commit 4c11809764)
2019-05-16 16:35:23 -07:00
David Brazdil
deb96a9174 Change CellSignalStrengthGsm.mTimingAdvance to greylist-max-p
Hidden APIs whose access has been restricted in Q should be assigned
maxTargetSdk=P. Fix a field in CellSignalStrengthGsm which was assigned
maxTargetSdk=O.

Bug: 124354830
Test: check out/soong/hiddenapi/hiddenapi-flags.csv
Merged-In: I025887bf7fbc513da155bfe12919cfea9bd9c5fa
Change-Id: I025887bf7fbc513da155bfe12919cfea9bd9c5fa
(cherry picked from commit 2959b5c136)
2019-05-16 17:32:42 +01:00
Malcolm Chen
0b9b81b36a Adding subscription group owner.
Define owner of a subscription group. Such that when subscriptions are
being added into or removed from a group, as long as callingPackage is
the owner, it can skip carrier permission check on the subscriptions in
the group.

This is necessary when a subscription is being added into a
group that contains inactive subscription, which mean its carrier
privilege can't be verified.

Bug: 131854492
Test: cts, unittest, TelephonyManagerTestApp
Change-Id: If2f5b9c8d71469d9e60f1ca48cab36938cd72c48
Merged-In: If2f5b9c8d71469d9e60f1ca48cab36938cd72c48
2019-05-15 20:08:22 -07:00
TreeHugger Robot
32891b31b2 Merge "DO NOT MERGE - Merge pi-platform-release (PPRL.190505.001) into stage-aosp-master" into stage-aosp-master 2019-05-15 23:02:14 +00: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
Amit Mahajan
ecdf8c596e Add NAME_SOURCE_CARRIER for subscription display name.
Test: manual
Bug: 131803649
Merged-in: Ieb7d691fb88866162b287f87d5a2b2d94adac7c3
Change-Id: Ieb7d691fb88866162b287f87d5a2b2d94adac7c3
(cherry picked from commit 24e102e0e0)
2019-05-15 09:38:27 -07:00
Jack Yu
a255aeab99 Fixed incorrect metered/unmetered APN in AP-assisted mode
From now all data traffic through IWLAN will be unmetered. Only
data through cellular will be checked for metered/unmetered.

Test: Unit tests
Bug: 132433959
Merged-In: Id1498fb8627dd7221a5ab7cde72929e6ee25b425
Change-Id: Id1498fb8627dd7221a5ab7cde72929e6ee25b425
(cherry picked from commit 7ff7865d7b)
2019-05-14 17:19:16 -07:00
chen xu
2a5483ff77 PhoneStateListener msim improvement
1. Docuemnt the scope of each callback event either apply to specific
subscriptions or not.
2. TelephonyRegistry store separate state e.g, precisecallstate, callAttribute
for each slot to support msim.
3. Add missing subscription match check when notify callbacks.

Bug: 130423985
Bug: 132181378
Test:  atest CtsTelephonyTestCases:PhoneStateListenerTest
Merged-In: I4b014e00528a1f05e0b5f237229c561f8260e2bd
Change-Id: I4b014e00528a1f05e0b5f237229c561f8260e2bd
(cherry picked from commit d5deeb15e9)
2019-05-13 21:38:12 -07:00
Jordan Liu
f1aca7cf4e Merge "Update getMergedSubscriberIds to pass subId" 2019-05-13 18:16:18 +00:00
Jordan Liu
857c4cbf5f Update getMergedSubscriberIds to pass subId
Bug: 131189269
Test: manual
Merged-In: I0d237b646969442b71597e66c9cb491c02a144d3
Change-Id: I0d237b646969442b71597e66c9cb491c02a144d3
(cherry picked from commit 973a60d76ec29e7295237ef8b6670f81917b071b)
2019-05-10 14:39:11 -07:00
Brad Ebinger
be49b65d15 Merge "Use requestType, not service type for interrogation check" 2019-05-09 22:09:06 +00:00
Brad Ebinger
ff8f2885d4 Use requestType, not service type for interrogation check
Test: atest GtsTelephonyTestCases
Bug: 127258685
Merged-In: Ib0cf44f58f02125ee0e4dc52e4073cd87d55ce52
Change-Id: I9502c8efe20fc7ce2d2f9e03f3e1b09c28c45de0
2019-05-09 21:16:45 +00:00
Jordan Liu
7ac267a585 Merge "Update getCardId doc with details"
am: a0a72ec485

Change-Id: Ic6c014f7b086fad8b7fa131366839e35ebbd7dd1
2019-05-07 15:00:32 -07:00
Jordan Liu
a0a72ec485 Merge "Update getCardId doc with details" 2019-05-07 21:26:02 +00:00
Shuo Qian
22f7e515c5 Merge "Sorting and merge Emergency number better"
am: 70ed8dba68

Change-Id: Ic04771d79d96affb99876fe92a9768937ea93885
2019-05-07 11:18:12 -07:00
sqian
a686f723a8 Sorting and merge Emergency number better
Apply more parameters to sort Emergency number list, it is important
to keep two lists Collection-equal to each other if they have the same
contents. Otherwise, it will introduce more unnecessary updates in
 EmergencyNumberTracker and it may confuse users.

Test: atest EmergencyNumberTest
Bug: 131922424
Change-Id: I64a43886d4000b261ea703b081e6278b0307805f
Merged-In: I64a43886d4000b261ea703b081e6278b0307805f
(cherry picked from commit a1f21a5c2c)
2019-05-07 09:21:26 -07:00
Jordan Liu
8d9f83ee09 Update getCardId doc with details
getCardId() returns the EID in some cases and ICCID in others. Add
comments explaining exactly when it returns what.

Test: no change in behavior
Bug: 131423779
Change-Id: Id0cbae3affdf4c034b2435bf77371ae1355d3cfa
2019-05-06 16:38:27 -07:00
Brad Ebinger
f264757c96 Merge "Rollback SHELL UID check for CarrierConfigLoader"
am: bdb61f3cf2

Change-Id: Idd55627f0e81b99d56c2a2d8fffa1d04a49ad76f
2019-05-06 16:09:55 -07:00
Brad Ebinger
bdb61f3cf2 Merge "Rollback SHELL UID check for CarrierConfigLoader" 2019-05-06 22:57:27 +00:00
Brad Ebinger
e7704769a5 Rollback SHELL UID check for CarrierConfigLoader
When a test calls adoptShellPermissionIdentity before
calling a command, it doesn't adopt the shell UID, only
the permissions. So, we can not use
Binder#getCallingIdentity to determine it the API is
being called as part of a test. For now, we must only
use MODIFY_PHONE_STATE until a better pattern is
established.

Test: Manual
Bug: 131185660
Merged-In: I607b7c9afe1c384a41ce12b92ae43747b2ee1bc3
Change-Id: I59d32a2e36950b2485e1a46a25e3724928676219
2019-05-06 22:02:15 +00:00
Youming Ye
fb96cce39c Merge "Pass in external packageName"
am: 1764f6a49e

Change-Id: I39d486e0c8819452d219d487745aa5ced85c93af
2019-05-02 19:16:04 -07:00
Treehugger Robot
1764f6a49e Merge "Pass in external packageName" 2019-05-03 01:33:30 +00: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
Leland Miller
7f0ffaf976 Merge "Add calling package parameter to IRcs methods"
am: 017d7b585d

Change-Id: I8ad891352f0003ea8524780080d0fd53222219e1
2019-05-02 14:05:53 -07:00
Treehugger Robot
017d7b585d Merge "Add calling package parameter to IRcs methods" 2019-05-02 20:43:04 +00:00
Youming Ye
cf583a5e91 Merge "AddRestrictCause"
am: 7044350d98

Change-Id: Ia91efd83dd1461a4680e29e66163b3658a5791f3
2019-05-02 10:33:16 -07:00
Treehugger Robot
7044350d98 Merge "AddRestrictCause" 2019-05-02 17:10:18 +00:00
Jordan Liu
88f125c096 Merge "Update getUiccCardsInfo doc"
am: 39fbf96b5a

Change-Id: I2b3af7fb26bfd5e403401daaac37888877bca851
2019-05-01 15:02:42 -07:00
Xiangyu/Malcolm Chen
9cdbb1a981 Merge "Add EuiccManager#EXTRA_PHYSICAL_SLOT_ID to detect it's an operation for pSIM."
am: d3daa7a40e

Change-Id: I8e5d90ed969058b359321aeb6af8492f72d3a2f5
2019-05-01 14:57:16 -07:00
Jordan Liu
39fbf96b5a Merge "Update getUiccCardsInfo doc" 2019-05-01 21:32:46 +00:00
Xiangyu/Malcolm Chen
d3daa7a40e Merge "Add EuiccManager#EXTRA_PHYSICAL_SLOT_ID to detect it's an operation for pSIM." 2019-05-01 20:49:16 +00:00
Holly Jiuyu Sun
255d64e7a6 Add EuiccManager#EXTRA_PHYSICAL_SLOT_ID to detect it's an operation for pSIM.
Platform needs to pass LPA the pSIM slotId so that LPA knows it's a
toggle action on pSIM.

Bug: 123945155
Test: build
Change-Id: Ie0db50e8ade4c6ce385ebfbfe7cf9e2982d67e34
Merged-In: Ie0db50e8ade4c6ce385ebfbfe7cf9e2982d67e34
2019-05-01 11:53:06 -07:00
Jordan Liu
eb5c27d469 Update getUiccCardsInfo doc
This method will return info for inactive eUICCs, filtered by carrier
privilege. (Since we can't read carrier privilege on an inactive eUICC,
we always assume that the caller does not have carrier privilege).

Bug: 130826215
Test: manual
Change-Id: Id89fa48f119004b6c18bd21791396bc6c3df2c95
Merged-In: Id89fa48f119004b6c18bd21791396bc6c3df2c95
2019-05-01 10:32:36 -07:00
Youming Ye
21078f0cd6 AddRestrictCause
Bug: 130744052
Test: Build
Change-Id: I51c49b8736c42276f7fd66168eeb3f9959b4d492
2019-04-30 14:32:36 -07:00
Leland Miller
995c9ad44d Add calling package parameter to IRcs methods
This will be used for permission handling in the IRcs service.

Test: Existing tests pass, both unit and RcsCtsTestCases
Change-Id: I7f2183cd2f764b8293d29dc2c278479e06d9d8a2
2019-04-29 15:18:10 -07:00
Pengquan Meng
6f7ccba005 Merge "Fixed the comment of carrier config for CDNR"
am: e994a0d66a

Change-Id: I33dddc12e64b681e23e5600ab4a1c9cf560f795b
2019-04-25 15:18:45 -07:00
Pengquan Meng
b4a53fdb9e Fixed the comment of carrier config for CDNR
Bug: 122921456
Test: build
Merged-In: If5cc8d37ba1e66d59e5bfe9444fe4108f2263be9
Change-Id: If5cc8d37ba1e66d59e5bfe9444fe4108f2263be9
(cherry picked from commit 7ac9a8f314)
2019-04-25 11:23:27 -07:00