Commit Graph

3405 Commits

Author SHA1 Message Date
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
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
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
dd4b36a12c Add comments for boolean parameters in translate().
Test: none
Bug: 132259056
Change-Id: Ia57d8a81a980959ea1f79692501edd88a8bab273
2019-05-21 17:32:45 -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
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
Xin Li
5bc12066ca Merge "DO NOT MERGE - Merge Pie Bonito/Sargo into master." 2019-05-09 22:05:45 +00:00
Thom Hurks
17a01554c7 Use correct variable for init in GsmAlphabet
When initializing the shift table in GsmAlphabet the correct
variable is now used. An error was logged already if the value
is wrong, so this does not have any logic correctness or
performance impact, just code correctness.
Test: very small refactoring. Tests still pass.

Change-Id: I5329cfa0be63b6a3ebd06414c6247d94ca93f40b
Signed-off-by: Thom Hurks <thomhurks@gmail.com>
2019-05-09 00:01:13 +02:00
Jordan Liu
88f125c096 Merge "Update getUiccCardsInfo doc"
am: 39fbf96b5a

Change-Id: I2b3af7fb26bfd5e403401daaac37888877bca851
2019-05-01 15:02:42 -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
Xiangyu/Malcolm Chen
386d538f9d Merge changes from topic "128616035"
am: dc4d14b37a

Change-Id: I0f9807127cdd46079a969532bdeb121bf544921d
2019-04-19 10:14:32 -07:00
Malcolm Chen
4d6ff22849 Adding @hide API to return whether an APN is metered or not.
In addition, make isMmsDataEnabled more generic:
isDataEnabledForApn

Bug: 128616035
Test: manual
Change-Id: Icd520c3094dd761a13435fae79b7b6b3ba2ebda9
Merged-In: Icd520c3094dd761a13435fae79b7b6b3ba2ebda9
2019-04-19 01:23:39 -07:00
Malcolm Chen
7611d69c75 Add API to set alwaysAllowMms
Add API in SubscriptionManager setAlwaysAllowMmsData
and isMmsDataAllowed.

Bug: 128616035
Test: unittest
Change-Id: Ie56c2d0619a68b188c35e8e24db6c2012d22538b
Merged-In: Ie56c2d0619a68b188c35e8e24db6c2012d22538b
2019-04-18 19:55:33 -07:00
Jack Yu
4f1a82ac5b Merge "Fixed the incorrect function signature"
am: 0233bc3e85

Change-Id: Ic78ee64402bce334f30073c9bf52589314404066
2019-04-12 16:43:53 -07:00
Jack Yu
b8e354206f Fixed the incorrect function signature
The name source should be an integer instead of long

Test: Manual + unit tests
Bug: 130237749
Merged-In: Ic4447da24073d37401ae0f6e8f8b41bd60d7167d
Change-Id: Ic4447da24073d37401ae0f6e8f8b41bd60d7167d
(cherry picked from commit 5d8f6447a7)
2019-04-10 17:15:06 -07:00
Tobias Thierer
cccb4f08ea Merge "Add missing @Deprecated annotation."
am: 498562c3cb

Change-Id: I8e744a739a5772e68fb87cf64747d9e7c03bf416
2019-04-10 04:51:08 -07:00
Tobias Thierer
77645d05fc Add missing @Deprecated annotation.
make warns when a @deprecated javadoc tag is not matched by
a corresponding annotation. The other @deprecated fields in
this class have both.

Fixes: 71706673
Test: Treehugger
Change-Id: I3749a54acc9f63dabdacac77849add34d4085561
2019-04-10 10:32:04 +01:00
Xiangyu/Malcolm Chen
04946bdad4 Merge changes from topics "126864501", "129296702"
am: 9f80ec1d51

Change-Id: Iadd23b2af9d4f85d88f6915d042641d2f481a784
2019-04-08 15:43:09 -07:00
Malcolm Chen
96dd9e4dfe Add @hide API to return whether a modem stack is enabled or not.
Bug: 129296702
Test: TelephonyManagerTestApp
Change-Id: I7ef4ad8322cf85e5a159363e90dde303ac7240de
Merged-In: I7ef4ad8322cf85e5a159363e90dde303ac7240de
2019-04-08 12:53:50 -07:00
Tyler Gunn
f31c79bef4 Merge "Add @hide API to get the phone account handle for a subId."
am: f910aa4e60

Change-Id: Ib7e13db1f586b9032082683ebae083b3b68ae11e
2019-04-04 11:34:35 -07:00
Tyler Gunn
f910aa4e60 Merge "Add @hide API to get the phone account handle for a subId." 2019-04-04 18:26:29 +00:00
Tyler Gunn
c0340aa16a Add @hide API to get the phone account handle for a subId.
This is used in SubscriptionManager to figure out which phone account
is being updated when the default voice sub changes.  It seemed like
a good spot to put it since we should really have an api for this in
the future.

Test: Manual, manual, manual
Bug: 128916238
Change-Id: If5137c0e7f01a14810e0ee94e5d857d69f368a87
2019-04-03 20:18:01 -07:00
Xiangyu/Malcolm Chen
f9edc9fffd Merge "API Feedback for CBRS"
am: 9c706654a2

Change-Id: I6a6d0a81100093696fc6e4b66b32e34dbed49913
2019-04-01 19:10:02 -07:00
Malcolm Chen
4674a797e9 API Feedback for CBRS
Bug: 128902411
Test: unittest
Change-Id: I2476834a5048d0e3c2c3413d7168a7a3ad2d7042
Merged-In: I2476834a5048d0e3c2c3413d7168a7a3ad2d7042
2019-04-01 15:23:53 -07:00
Xiangyu/Malcolm Chen
4e32ac7754 Merge "Remove clearDefaultsForInactiveSubIds."
am: 1e263e7bc0

Change-Id: I8fb91dd4928cf8a607a876cc304c261bfb762a59
2019-04-01 14:05:57 -07:00
Xiangyu/Malcolm Chen
1e263e7bc0 Merge "Remove clearDefaultsForInactiveSubIds." 2019-04-01 20:51:54 +00:00
Malcolm Chen
8231d3b231 Remove SubscriptionManager#setMetered API.
am: 9b932fa1a4

Change-Id: I55b74e102d77785e7f925d02049037b24a5d352a
2019-03-29 15:21:07 -07:00
Xiangyu/Malcolm Chen
dc4cb81c83 Merge changes from topics "128455935", "123661746"
* changes:
  Better description and parameter name of setPreferredDataSubscriptionId
  Remove SubscriptionManager#setMetered API.
2019-03-29 21:48:10 +00:00
Malcolm Chen
60cc67f5ac Remove clearDefaultsForInactiveSubIds.
clearDefaultsForInactiveSubIds is no longer needed as Telephony
has internal logic to clear or update default settings automatically.

Bug: 128645056
Test: manual
Change-Id: Ib7bc0ae6dba6f10e3a052df1644cc77dd30121a9
Merged-In: Ib7bc0ae6dba6f10e3a052df1644cc77dd30121a9
2019-03-29 14:41:59 -07:00
Shuo Qian
27da4d70d4 Merge "Check permissions and carrier privilege in notifyActiveDataSubIdChanged"
am: 801cd8ff8a

Change-Id: I15ce52efcea9b00cfe8ea5190aa58457386528b1
2019-03-29 13:29:26 -07:00
sqian
7cf1017c39 Check permissions and carrier privilege in notifyActiveDataSubIdChanged
Bug: 127978132
Test: Treehugger
Merged-In: I1d9c5d1b242953a2af3e56718ef82761941d8d9c
(cherry picked from commit 9e9ed18772)

Change-Id: Ia25472063d6f42c36f429e725d364ecf4f16fec1
2019-03-29 11:35:29 -07:00
Malcolm Chen
9b932fa1a4 Remove SubscriptionManager#setMetered API.
Bug: 123661746
Test: sanity
Change-Id: Ia6772dee1bd566e0be6b06455d92c923d2c01b12
Merged-In: Ia6772dee1bd566e0be6b06455d92c923d2c01b12
2019-03-28 18:01:09 -07:00
Amit Mahajan
012a279038 Merge "Device could not use wifi hotspot when data card switch to sim2"
am: cd24e832e8

Change-Id: I9ae2b31e6dd3f4a4c575ff37b8a9df58eb2c2e70
2019-03-26 15:45:52 -07:00
Amit Mahajan
cd24e832e8 Merge "Device could not use wifi hotspot when data card switch to sim2" 2019-03-26 21:18:23 +00:00
Brad Ebinger
3b176bc1de Merge "Query isEmergencySmsMode API when checking if emergency for GPS"
am: dedc27142d

Change-Id: Ieccb97fb300455e9338c022c46466bed355be79a
2019-03-22 10:36:07 -07:00
Brad Ebinger
dedc27142d Merge "Query isEmergencySmsMode API when checking if emergency for GPS" 2019-03-22 17:18:47 +00:00
Michele Berionne
be4d9657a7 Merge "Modified MultiSim APIs"
am: c5461c4490

Change-Id: I12da49b887202f340be7f1a290bdc8c99863eac0
2019-03-21 12:07:24 -07:00
苗苗 (Miao Miao)
3be9888e5a Device could not use wifi hotspot when data card switch to sim2
STEPS TO REPRODUCE:
1. Test devide insert two sim card into the phone,Sim1 do not support DUN APN and sim2 support DUP APN
2. Switch data card to sim2
2. Enable wifi hotspot
3. Reference phone connect test device wifi hotspot and access website

OBSERVED RESULTS:
Reference phone could connect to test device wifi hotspot but could not access to Internet

Test: Whether wifi hotspot available when sim2 which support DUN APN is data card
Change-Id: I733ccea273b03efc6bbc59c3308d0b7941eb282b
2019-03-21 16:20:05 +08:00
Michele
8e17c7064d Modified MultiSim APIs
Capitalize S in Multisim.
isMultiSimSupported should return three states, to describe the three possible cases
(hardware not supported, hardware supported but carrier restricted, available)

Bug: 128524079
Test: compilation
Change-Id: Icbd36f714c577a965d39336d54d7224c8c2c7cd2
Merged-In: Icbd36f714c577a965d39336d54d7224c8c2c7cd2
2019-03-20 23:04:52 -07:00
Brad Ebinger
5eeb79d4b5 Query isEmergencySmsMode API when checking if emergency for GPS
When location SUPL request comes in for GPS NI handler,
also check emergency SMS mode in telephony, which
is true for a carrier defined amount of time after an
emergency SMS is sent.

Bug: 126091115
Test: manual - send fake emergency sms, check api is true.
Change-Id: I34d26d2940af5b0c412e20ce3668344da8656339
2019-03-20 11:11:10 -07:00
Brad Ebinger
c6d673901a Merge "Emergency API review"
am: 853983ef32

Change-Id: Idcfa450fba2e08d825bbe2b95094a7e7f070421b
2019-03-18 16:50:54 -07:00
sqian
3b5f87f965 Emergency API review
1) Remove 'current' in Emergency APIs
2) Remove nullable
3) Handled the null Telephony service case
4) Hide getEmergencyServiceCategoryBitmask
5) Make getEmergencyUrns unmodifiable

Test: Treehugger
Bug: 122368381
Bug: 126699022
Bug: 126701211
Merged-In: I6eb1d8a3ae1625ff3f43f983c488c2969649713b
Change-Id: I6eb1d8a3ae1625ff3f43f983c488c2969649713b
2019-03-18 15:18:00 -07:00
Jordan Liu
ca075c3176 Merge "Add slot based ICC channel APIs"
am: e278d2bcdd

Change-Id: Ifaaddfc58ee684393bcabfc214d72746125ed158
2019-03-18 13:38:37 -07:00
Jordan Liu
e278d2bcdd Merge "Add slot based ICC channel APIs" 2019-03-18 18:36:54 +00:00
Sooraj Sasindran
f6b0d994a7 Merge changes from topic "Porting-ONSAPIChanges"
am: 31c7607ee6

Change-Id: Ibca8c0202ff702be57f128b0cc24a8679d0a8083
2019-03-15 12:53:18 -07:00
Sooraj Sasindran
31c7607ee6 Merge changes from topic "Porting-ONSAPIChanges"
* changes:
  Should not turn on validation for data
  Provide network bands in AvailableNetworkInfo
2019-03-15 19:31:55 +00:00
Jordan Liu
118895f571 Add slot based ICC channel APIs
These are SystemApis which require MODIFY_PHONE_STATE, and can be used
to open ICC channels when there is no available subscription, using the
slot index instead of subId.

Bug: 126578014
Test: builds
Change-Id: I3f47a8ac07813ea9e326c7d76123352708bfeea2
Merged-In: I3f47a8ac07813ea9e326c7d76123352708bfeea2
2019-03-14 14:25:25 -07:00
Sooraj Sasindran
3b09d711f9 Should not turn on validation for data
Should not turn on validation for data switch every time.
Provide result as a callback

Test: verified manually
Bug: 126264455
Merged-In: I5df2311d91fdab34563148b4466163696e52faf9
Change-Id: I5df2311d91fdab34563148b4466163696e52faf9
2019-03-13 15:36:11 -07:00