Commit Graph

9842 Commits

Author SHA1 Message Date
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
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
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
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
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
Brad Ebinger
2a2cad3c71 Merge "@hide some APIs that will not be used in Android R" am: 31486405f8
Change-Id: I5f04dd96dcee70d67ba4898744bfe14314f7c00e
2020-04-01 20:12:08 +00:00
Malcolm Chen
d5349e23b0 Add documentation for ACTION_MULTI_SIM_CONFIG_CHANGED
Bug: 143652732
Test: build
Change-Id: Id27e6edc82a48ece4a94c8bc7aadbc5e1acf08d7
Merged-In: Id27e6edc82a48ece4a94c8bc7aadbc5e1acf08d7
2020-04-01 12:29:25 -07:00
Brad Ebinger
c1d954c78e @hide some APIs that will not be used in Android R
Bug: 147319232
Bug: 148123085
Bug: 147732815
Test: atest CtsTelephonyTestCases
Merged-In: I623e52432fc820d302fcdbdb9a88a37deed455ae
Change-Id: I623e52432fc820d302fcdbdb9a88a37deed455ae
2020-04-01 10:58:42 -07:00
Daniel Bright
62fe99d1a8 Merge "Undo isDataCapable as Public API" am: 7abd26ae78
Change-Id: Ib71163d76a1fc3af1eda1b5e41346c315e45a918
2020-04-01 16:55:35 +00:00
Daniel Bright
afecb43f84 Merge "Remove "@Deprecated" from supplyPinReportResult + supplyPukReportResult" am: 1656c8f186
Change-Id: Ib196dd1ddf0417ebb462e8b81515334d23fb0d7f
2020-04-01 16:54:41 +00:00
Daniel Bright
7abd26ae78 Merge "Undo isDataCapable as Public API" 2020-04-01 16:37:35 +00:00
Daniel Bright
1656c8f186 Merge "Remove "@Deprecated" from supplyPinReportResult + supplyPukReportResult" 2020-04-01 16:36:58 +00:00
Collin Fijalkovich
074363d713 Merge "Cache getDefaultDataSubscriptionId Binder calls" 2020-04-01 16:14:25 +00:00
Sarah Chin
f77419242b Merge "Unexpose getDataRoamingFromRegistration API" am: c9252b3591
Change-Id: Iafe65ac0dbe6a89c654ae05e944da4b1c1c2b41c
2020-04-01 00:02:01 +00:00
Sarah Chin
c9252b3591 Merge "Unexpose getDataRoamingFromRegistration API" 2020-03-31 23:44:35 +00:00
Sarah Chin
7567c1aa52 Merge "API Review: rename isGlobalModeEnabled" am: 8e1c444d07
Change-Id: I74d9182098d3ae24a95ad0c42548bf16e97d0fe1
2020-03-31 23:15:08 +00:00
Sarah Chin
02dd966131 Merge "Un-deprecate SmsManager APIs" am: 2827393816
Change-Id: I1a9b2c4480916bb8eb5d6bb6f966a3ec8aee819c
2020-03-31 23:14:24 +00:00
Sarah Chin
8e1c444d07 Merge "API Review: rename isGlobalModeEnabled" 2020-03-31 23:02:20 +00:00
Sarah Chin
2827393816 Merge "Un-deprecate SmsManager APIs" 2020-03-31 22:59:53 +00:00
Sarah Chin
5fe578fabd Merge "Remove Mainline APIs for MmsManger and TelephonyManager" am: f8bd172434
Change-Id: I4d20fb3768363a172752766ad6243e185e19a76a
2020-03-31 20:58:17 +00:00