Commit Graph

13322 Commits

Author SHA1 Message Date
Jack Yu
773d706a71 Merge "Only setup data when config and sim is ready" into rvc-dev am: 8f19a55f50 am: 04cedc9a0f am: dc99d1ec92 am: 05007e2f3c
Change-Id: I0b874a7484fc51b4bf6d422db21129500624367b
2020-04-08 09:21:01 +00:00
Jack Yu
dc99d1ec92 Merge "Only setup data when config and sim is ready" into rvc-dev am: 8f19a55f50 am: 04cedc9a0f
Change-Id: Id7b729cfc1450fee1afc388a3042946b4ce43c1f
2020-04-08 08:48:30 +00:00
Jack Yu
8f19a55f50 Merge "Only setup data when config and sim is ready" into rvc-dev 2020-04-08 08:13:10 +00:00
Hall Liu
09ad9f0d67 Merge "Fix order of uid/pid in LocationAccessPolicy" into rvc-dev am: f6d37fc03f am: ed6c9bc9bf
Change-Id: Ic39c8c055fc25871999693273b15e9cd1fc7fbfb
2020-04-08 01:07:05 +00:00
Jack Yu
38de77534a Only setup data when config and sim is ready
SIM needs to be fully loaded before we can setup
data connection because APN slection requires
MCC/MNC on the SIM. Also lots of data related configs
are stored in carrier config. Both needs to be ready
before we can setup a data connection (except for
emergency APN).

Bug: 152816633
Test: Manual + unit tests

Change-Id: I69c7838bdd9751bef4c15e9504519b55afb9fefb
2020-04-07 16:57:59 -07:00
Hall Liu
7e826f9531 Fix order of uid/pid in LocationAccessPolicy
Fix the order in which uid and pid are passed into the permission check.

Test: atest LocationAccessPolicyTest
Fixes: 151330809
Change-Id: I479c8fc123d5a994e8cbe6489aa00bea4abca1c7
(cherry picked from commit 0cd4dbc0b3)
2020-04-07 21:20:07 +00:00
James Lin
234600c2df Merge "[RCS] Add apis to register and unregister UCE publish state changed." am: 9f4da761af am: 8c5c4b55a9 am: 12dd15688d am: f444d152bd am: b9eac7d5a0
Change-Id: Icd4ce4a5d41c356f55231b25ba43b02e47d4db2b
2020-04-07 17:52:40 +00:00
James Lin
12dd15688d Merge "[RCS] Add apis to register and unregister UCE publish state changed." am: 9f4da761af am: 8c5c4b55a9
Change-Id: Ieaf763cbe8b5df54e17923966d89f69082b2a0fc
2020-04-07 17:42:37 +00:00
James Lin
8c5c4b55a9 Merge "[RCS] Add apis to register and unregister UCE publish state changed." am: 9f4da761af
Change-Id: I8edee149e6a53ba180abc510f64ca1405b781307
2020-04-07 17:26:20 +00:00
James Lin
9f4da761af Merge "[RCS] Add apis to register and unregister UCE publish state changed." 2020-04-07 17:10:41 +00:00
Treehugger Robot
ac40efb9e4 Merge "Use an original text for next force 7bit encoding" am: d72172d5de am: f61540d482 am: d65e5d7f8b am: e42327d3a9 am: 47fd1a953e
Change-Id: I9ec36ef21f0ea2b195daa48154ca56fd6acd3d04
2020-04-07 04:19:52 +00:00
Treehugger Robot
d65e5d7f8b Merge "Use an original text for next force 7bit encoding" am: d72172d5de am: f61540d482
Change-Id: Ifcfeae5477074c163224b242ab93a894efee3baa
2020-04-07 03:16:11 +00:00
Treehugger Robot
f61540d482 Merge "Use an original text for next force 7bit encoding" am: d72172d5de
Change-Id: Iebf62e4fc4f8618e3b92fd79de527bc70972ddaf
2020-04-07 02:52:41 +00:00
Treehugger Robot
d72172d5de Merge "Use an original text for next force 7bit encoding" 2020-04-07 02:32:15 +00:00
Collin Fijalkovich
81e6049f4b Merge "Cache getActiveDataSubscriptionId Binder calls" 2020-04-06 16:11:26 +00:00
Nathan Harold
a84db5e5f7 Merge "Check HIDL Discriminator for CSG Info" am: 3a87f98eb6
Change-Id: Ie8bf079b3df835b7f1fe42a2079a585a881d4826
2020-04-03 23:41:01 +00:00
Nathan Harold
3a87f98eb6 Merge "Check HIDL Discriminator for CSG Info" 2020-04-03 23:28:39 +00:00
Daniel Bright
99733f8d2a Merge "SIM De-personalization" am: 5e423ac87c
Change-Id: I43a8301c7f38a43d7728f583c852b85719f8c29b
2020-04-03 22:36:35 +00:00
Hall Liu
6c61ef504d Merge "Fix order of uid/pid in LocationAccessPolicy" 2020-04-03 22:35:43 +00:00
Nathan Harold
8f19e4f21f Check HIDL Discriminator for CSG Info
ART throws an exception if an unpopulated safe union element
is accessed at runtime, so instead we have to check the
hidl_discriminator to see whether the element is populated
before trying to access it (and thus we skip the null check).

Bug: 152486447
Test: atest testCellIdentityLte_1_5_CsgInfo \
        testCellIdentityWcdma_1_5_CsgInfo \
        testCellIdentityTdscdma_1_5_CsgInfo
Merged-In: I08dc0d2050a9f4d4b574178e1c68a23d015768e4
Change-Id: I08dc0d2050a9f4d4b574178e1c68a23d015768e4
(cherry picked from commit f85a2e9220)
2020-04-03 15:25:03 -07:00
Daniel Bright
5e423ac87c Merge "SIM De-personalization" 2020-04-03 22:18:13 +00:00
Treehugger Robot
bfa4799c06 Merge "Throw RuntimeException/ImsException when binder is null." am: afa19b5208
Change-Id: Ic623b6bdc3e15ff026be51f6cf0914ec11c55281
2020-04-03 22:05:26 +00:00
Treehugger Robot
afa19b5208 Merge "Throw RuntimeException/ImsException when binder is null." 2020-04-03 21:41:30 +00:00
Nathan Harold
5c1cd115c1 Merge "Check HIDL Discriminator for CSG Info" into rvc-dev am: 4af4402121 am: 4ebfdc1b6d am: a14d8b1eee am: 970bb78fcf
Change-Id: I11780c101b7177ff07131df984ebcc567ae64231
2020-04-03 20:20:33 +00:00
Nathan Harold
a14d8b1eee Merge "Check HIDL Discriminator for CSG Info" into rvc-dev am: 4af4402121 am: 4ebfdc1b6d
Change-Id: I468676ab5cccfad1ce6a34f83ae5b6bd61e176d7
2020-04-03 19:42:07 +00:00
Nathan Harold
1d51a842dc Merge "Check HIDL Discriminator for CSG Info" into rvc-dev am: 4af4402121
Change-Id: I79758e8b428a8b785556656a716f41c492e0e0b4
2020-04-03 19:18:47 +00:00
James.cf Lin
c111ead0c5 [RCS] Add apis to register and unregister UCE publish state changed.
Provide register and unregister callback apis for clients to receive the UCE publish state changed.

Bug: 139262111
Test: atest UserCapabilityExchangeImplTest
Change-Id: I3248e78d3146be5e966876b80f76d47014694b33
2020-04-03 19:12:44 +00:00
Nathan Harold
4af4402121 Merge "Check HIDL Discriminator for CSG Info" into rvc-dev 2020-04-03 18:56:45 +00:00
Sarah Chin
0a60c62d7d Merge "Add rebroadcast extra to CARRIER_CONFIG_CHANGED" into rvc-dev am: d58849abe2 am: d3df408d98 am: 8b3aac3f45 am: 6c82860569
Change-Id: I20dd5df5970da93ba5ad0066069343655be9dff2
2020-04-03 18:13:15 +00:00
Sarah Chin
8b3aac3f45 Merge "Add rebroadcast extra to CARRIER_CONFIG_CHANGED" into rvc-dev am: d58849abe2 am: d3df408d98
Change-Id: Idc672cdafeb2a0bc20c45616fae428afbd2c11eb
2020-04-03 17:16:43 +00:00
Sarah Chin
6b120b122c Merge "Add rebroadcast extra to CARRIER_CONFIG_CHANGED" into rvc-dev am: d58849abe2
Change-Id: I68d00ab9eccd68fdacc9e0fe54a4212d5e40b6f0
2020-04-03 17:15:34 +00:00
Collin Fijalkovich
1cfdb2aec5 Cache getActiveDataSubscriptionId Binder calls
Use PropertyInvalidatedCache to avoid redundant
calls to SubscriptionController.getActiveDataSubscriptionId.
Bug: 151953109
Test: Verified cache operated correctly when phone process is killed.
Test: atest SubscriptionControllerTest
Test: atest android.telephony.cts.SubscriptionManagerTest

Change-Id: I45d1abf15e4b105c966d4a786a4dc33aa67b20aa
2020-04-03 10:15:08 -07:00
Sarah Chin
d58849abe2 Merge "Add rebroadcast extra to CARRIER_CONFIG_CHANGED" into rvc-dev 2020-04-03 17:06:22 +00:00
Tyler Gunn
ffcfaa7476 Merge "Update EmergencyNumber API docs to indicate they can throw." into rvc-dev 2020-04-03 17:02:24 +00:00
Collin Fijalkovich
a75b9d4c90 Merge "Add method for processes to disable SubscriptionManager caches" 2020-04-03 04:27:42 +00:00
Xiangyu/Malcolm Chen
2d7d174073 Merge "multiSimAllowed should be consistent with max active modem property." into rvc-dev am: e025fcef40 am: 8c3fee86ff am: 4dca1a242f am: 62bf9b5cde
Change-Id: I332a0e7e1b1fd7907ad7b185be8d1f5c7b29ff25
2020-04-03 01:49:32 +00:00
Taesu Lee
6568f8f20a Use an original text for next force 7bit encoding
If config_sms_force_7bit_encoding is true, an original text will be
translated based on 7-bit ASCII table for CDMA. But if the translated
text can not be encoded as single-part SMS, the original text should be
used for next try instead and it will be translated based on GSM 7-bit
alphabet for ENCODING_GSM_7BIT_ALPHABET.

Bug: 151061215
Test: Manual

Signed-off-by: Taesu Lee <taesu82.lee@samsung.com>
Change-Id: I679786b96d19c6f3f30ec3e2037221110f5d3f84
2020-04-03 10:35:55 +09:00
Xiangyu/Malcolm Chen
8c3fee86ff Merge "multiSimAllowed should be consistent with max active modem property." into rvc-dev am: e025fcef40
Change-Id: I0a650dca2cc96298fd8e1135ea233ea56af3dc25
2020-04-03 00:50:04 +00:00
Xiangyu/Malcolm Chen
e025fcef40 Merge "multiSimAllowed should be consistent with max active modem property." into rvc-dev 2020-04-03 00:43:30 +00:00
Collin Fijalkovich
1057e48cbe Add method for processes to disable SubscriptionManager caches
SubscriptionManager caching causes issues in the HeadsetPhoneStateTests,
so this method enables tests to disable the appropriate caches.

Test: atest BluetoothInstrumentationTests
Bug: 153103337
Change-Id: I8627fac11f90806ed5f5e5c05458ae6a19de8d39
2020-04-02 15:14:34 -07:00
Nazish Tabassum
a87844ab87 SIM De-personalization
Added constant support to framework for sim deperso

Test: make
Bug: 69389695
Merged-In: Ia7b9ca82570c1c9a9fed945d687e4bec4e87b3a1
Change-Id: I4b11e63b9d2bb9c59c79462c2a74706a572e7d35
(cherry picked from commit 64056e1262)
2020-04-02 13:52:55 -07:00
Automerger Merge Worker
031f56f2bc Update EmergencyNumber API docs to indicate they can throw.
Adding @throws tags for EmergencyNumber APIs so that callers are aware
that they can throw.
Test: Build; docs only change.
Bug: 134100020
Fixes: 152231444

Merged-In: Ic6bcd32ab93a97a8d075e720acb5fc17612a3984
Change-Id: Ic6bcd32ab93a97a8d075e720acb5fc17612a3984
(cherry picked from commit 5fe27428f0)
2020-04-02 18:24:50 +00:00
Malcolm Chen
ba874c6827 multiSimAllowed should be consistent with max active modem property.
Bug: 153023231
Test: manual - using test app
Change-Id: I2d38dd9a0a860ee451fe51372a62c2910b88c88f
2020-04-02 10:54:50 -07:00
Daniel Bright
7d8d87f145 Merge "SIM De-personalization" into rvc-dev am: 374189846f am: 9f2a425ef7 am: 989aa54bee am: 778e84d8f4
Change-Id: I2b4d8e34858af4f1b483bda6d9443405ef7fd687
2020-04-02 17:02:30 +00:00
Hall Liu
0cd4dbc0b3 Fix order of uid/pid in LocationAccessPolicy
Fix the order in which uid and pid are passed into the permission check.

Test: atest LocationAccessPolicyTest
Fixes: 151330809
Change-Id: I479c8fc123d5a994e8cbe6489aa00bea4abca1c7
2020-04-01 18:00:09 -07:00
Sarah Chin
53ae60d0de Add rebroadcast extra to CARRIER_CONFIG_CHANGED
Test: manual verify broadcast sent with/without extra
Bug: 152149072
Change-Id: Ib5d9c6f645f1b9b8deb9f896ecd67c68cb29dc17
2020-04-01 16:38:13 -07:00
Xiangyu/Malcolm Chen
b56feb4ae6 Merge "Add documentation for ACTION_MULTI_SIM_CONFIG_CHANGED" am: 44bb826ce8
Change-Id: I7b58c2b75d9d1584e6473ba760caa6c909fbabf4
2020-04-01 23:30:55 +00:00
Xiangyu/Malcolm Chen
44bb826ce8 Merge "Add documentation for ACTION_MULTI_SIM_CONFIG_CHANGED" 2020-04-01 23:06:00 +00:00
Daniel Bright
989aa54bee Merge "SIM De-personalization" into rvc-dev am: 374189846f am: 9f2a425ef7
Change-Id: Ia2a2351245636de9125a5f715c7a52ebcf8a3268
2020-04-01 20:39:54 +00:00
Daniel Bright
0b39e52119 Merge "SIM De-personalization" into rvc-dev am: 374189846f
Change-Id: I7d0251f0663e4416e2c6b9f13ee5195130e05f33
2020-04-01 20:20:36 +00:00