Commit Graph

4500 Commits

Author SHA1 Message Date
Brad Ebinger
ab92b16d31 Merge "Fix MmTelFeatureConnection Memory Leak" into rvc-dev am: 0b35eb55a8 am: 7064773052 am: 944ecbc8c1 am: f6430a20bc
Change-Id: Id9eb2091d464281011cd3865af5c2fa30d6c6994
2020-05-20 20:14:51 +00:00
Brad Ebinger
944ecbc8c1 Merge "Fix MmTelFeatureConnection Memory Leak" into rvc-dev am: 0b35eb55a8 am: 7064773052
Change-Id: I2b54773d8a029fd79219f1ec12e3d3925665c7d8
2020-05-20 19:45:28 +00:00
Brad Ebinger
0b35eb55a8 Merge "Fix MmTelFeatureConnection Memory Leak" into rvc-dev 2020-05-20 19:07:49 +00:00
Amit Mahajan
46137cea35 Merge "DUT fail to unlock SIM after selecting Home IMSI from STK When unlock SIM pin,SIM begin refresh, and the UiccCardApp was disposed." am: 62120dcc8c am: 67bec2d79b am: 963957ed4d am: b166347b64 am: c7e11453a5
Change-Id: I9d696fa3a69173a355c6575b0da275caddc2b173
2020-05-19 01:06:48 +00:00
Brad Ebinger
64e101323b Fix MmTelFeatureConnection Memory Leak
In FeatureConnection, we never cleaned up the ImsFeatureStatusCallback
after it was destroyed, leaving zombie FeatureConnections around.

Bug: 156893040
Test: atest FrameworksTelephonyTests
Change-Id: Idcf8b558c3807a3f9f5094afee532e76ea6f02cb
2020-05-18 17:46:06 -07:00
Amit Mahajan
963957ed4d Merge "DUT fail to unlock SIM after selecting Home IMSI from STK When unlock SIM pin,SIM begin refresh, and the UiccCardApp was disposed." am: 62120dcc8c am: 67bec2d79b
Change-Id: I2395255c3da76bb1da99fe243a280c65ba9baf95
2020-05-19 00:16:28 +00:00
Amit Mahajan
62120dcc8c Merge "DUT fail to unlock SIM after selecting Home IMSI from STK When unlock SIM pin,SIM begin refresh, and the UiccCardApp was disposed." 2020-05-18 23:38:22 +00:00
Xiangyu/Malcolm Chen
32eabf3935 Merge "Rename max.active.modems to active_modems.max_count" am: 414a71126e am: 6a5a8d74a8 am: 99b0cf2dc8 am: 8d6fa82d6e am: 3337a62b66
Change-Id: I2ea29d76a244b0b3e3af859ce1a94272616c1385
2020-05-09 02:46:32 +00:00
Xiangyu/Malcolm Chen
99b0cf2dc8 Merge "Rename max.active.modems to active_modems.max_count" am: 414a71126e am: 6a5a8d74a8
Change-Id: Ib34c296ab404bdabc69823448c16320e80deacd1
2020-05-09 02:03:51 +00:00
Malcolm Chen
412a6b5f6e Rename max.active.modems to active_modems.max_count
Bug: 154072245
Test: build
Change-Id: Ie1ce63782994db8092128f81d10040e1a2d684ea
Merged-In: Ie1ce63782994db8092128f81d10040e1a2d684ea
2020-05-09 01:45:01 +00:00
Xiangyu/Malcolm Chen
414a71126e Merge "Rename max.active.modems to active_modems.max_count" 2020-05-09 01:30:12 +00:00
Malcolm Chen
b3c815b0e0 Rename max.active.modems to active_modems.max_count
Bug: 154072245
Test: build
Change-Id: Ie1ce63782994db8092128f81d10040e1a2d684ea
2020-05-06 17:50:28 -07:00
Sooraj Sasindran
88823275ee Merge changes from topic "setDataEnabled"
* changes:
  Make sure to handle exceptions for setDataEnabled
  Revert^2 "Support api to control data by thermal service" ag/11382713 fixes exception issue with original change. 94b46ef784
2020-05-06 15:55:40 +00:00
Sooraj Sasindran
b2c6fee602 Revert^2 "Support api to control data by thermal service"
ag/11382713 fixes exception issue with original change.
94b46ef784

Bug: 151342791
Change-Id: I5e38549a3050d582017fe8bbf193adc65eb12860
2020-05-06 15:30:35 +00:00
Greg Kaiser
8720228eba Merge "Revert "Support api to control data by thermal service"" 2020-05-05 19:57:48 +00:00
Greg Kaiser
94b46ef784 Revert "Support api to control data by thermal service"
Revert "CTS test for api to control data by thermal service"

Revert "Support api to control data by thermal service"

Revert "Support api to control data by thermal service"

Revert submission 11171206-setDataEnabled

Bug: 155765311
Reason for revert: wembley gets into boot loop on reboot due to this code
Reverted Changes:
I3cdab9b04:Support api to control data by thermal service
I716cf6c45:CTS test for api to control data by thermal servic...
Ic5634e6f7:Support api to control data by thermal service
I763c422ba:Support api to control data by thermal service

Change-Id: If023dc8e106650b63706c0a5df24850c1260f785
2020-05-05 16:47:47 +00:00
Sooraj Sasindran
1e9c1966e6 Merge "Support api to control data by thermal service" 2020-05-04 23:49:27 +00:00
Sooraj Sasindran
ea5e69c414 Support api to control data by thermal service
Support api to control data by thermal service
Restructure data enablement API to have single API
with reason as an input to stop adding new apis
for new usecases.

Bug: 151342791
Test: added new CTS tests and verified

Change-Id: I763c422ba54907984977d19b2774c31337e5ffe5
2020-05-04 09:28:14 -07:00
Sarah Chin
22b7b5e3d7 Remove constants for DisplayInfo logic from DcTracker
Deprecate carrier configs for connected->not connected timer
Replaced DCT events with displayinfo changed listener

Test: atest NetworkTypeControllerTest, DcTrackerTest
Test: manual verify timer and meteredness works as expected
Bug: 154186364
Change-Id: I22a459e79f509f20c6b38386655c4b49315e3be7
Merged-In: I22a459e79f509f20c6b38386655c4b49315e3be7
2020-04-28 13:53:15 -07:00
Sarah Chin
2142d4bdad Merge changes from topics "displayinfocontroller", "remove_displayinfo" into rvc-dev am: 5227e8441d am: d6d2e5c1a8 am: 45ceb92314 am: 7fe994a505
Change-Id: I009c38065b0680ab510c57bf3891613e39112401
2020-04-28 17:27:05 +00:00
Sarah Chin
d6d2e5c1a8 Merge changes from topics "displayinfocontroller", "remove_displayinfo" into rvc-dev am: 5227e8441d
Change-Id: I727196619e88bdcebc4dfee128ed9677bed9b44a
2020-04-28 16:50:34 +00:00
Malcolm Chen
edaa0b780f Add a @hide API to indicate 5G and DSDS conflict.
Bug: 152786064
Test: build and manual
Change-Id: I79a8fda5b70a31acc365ebcbb03b73b20d2443fd
Merged-In: I79a8fda5b70a31acc365ebcbb03b73b20d2443fd
2020-04-27 18:27:16 -07:00
Jack Yu
4584d589bd 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

Merged-In: I69c7838bdd9751bef4c15e9504519b55afb9fefb
Change-Id: I69c7838bdd9751bef4c15e9504519b55afb9fefb
(cherry picked from commit 38de77534a)
2020-04-24 20:48:41 -07:00
Sarah Chin
86b8a847c7 Remove constants for DisplayInfo logic from DcTracker
Deprecate carrier configs for connected->not connected timer
Replaced DCT events with displayinfo changed listener

Test: atest NetworkTypeControllerTest, DcTrackerTest
Test: manual verify timer and meteredness works as expected
Bug: 154186364
Change-Id: I22a459e79f509f20c6b38386655c4b49315e3be7
2020-04-24 20:21:33 -07:00
Jordan Liu
6f76a035be Merge "Implement equals and hashCode" 2020-04-24 19:31:51 +00:00
Jordan Liu
aaff63781a Implement equals and hashCode
This keeps SmsHeader in sync with cellbroadcastservice.SmsHeader.

Bug: 148482334
Test: builds
Change-Id: I2a3188a603595e4c97acf6413036dcddf35c0b87
Merged-In: : I2a3188a603595e4c97acf6413036dcddf35c0b87
2020-04-23 15:26:31 -07:00
Jordan Liu
69726e907f Merge "Implement equals and hashCode" into rvc-dev am: 74918ad98b am: 2a274fa1c7 am: 7c25fc38b3 am: 3cadb2afc6
Change-Id: I443482d599600fb79a2e631c4e9f555b256a876e
2020-04-20 19:52:05 +00:00
Jordan Liu
2a274fa1c7 Merge "Implement equals and hashCode" into rvc-dev am: 74918ad98b
Change-Id: Id6e4a9d2652693eb9fedf0a8251792405ada3111
2020-04-20 18:57:02 +00:00
Jordan Liu
74918ad98b Merge "Implement equals and hashCode" into rvc-dev 2020-04-20 18:50:02 +00:00
Jack Yu
7d7adf75e0 Get rid of SIM record access in DcTracker
DcTracker uses several SIM related signals for different purposes.
Those signals include SIM record loaded/not-loaded, subscription
changed event, and carrier config changed event. Those signals
are slightly different but not that really important to DcTracker.
What DcTracker cares is
1. Whether SIM is inserted or not.
2. Whether configuration changes or not.

By listening to a single carrier config change event can handle
the cases above.

Removed all SIM record related places in DcTracker. SIM record should
not be accessed by anyone outside of UICC controller.

Test: Manual test + unit tests
Bug: 146168348
Merged-In: Iad45933ea77eb460625a891071535cbeaf8ac3b0
Change-Id: Iad45933ea77eb460625a891071535cbeaf8ac3b0
(cherry picked from commit df3001b935)
2020-04-19 00:25:09 -07:00
Jordan Liu
00fd9fd017 Implement equals and hashCode
This keeps SmsHeader in sync with cellbroadcastservice.SmsHeader.

Bug: 148482334
Test: builds
Change-Id: I2a3188a603595e4c97acf6413036dcddf35c0b87
2020-04-17 19:10:59 +00:00
Automerger Merge Worker
244de2c26c Merge "Merge "Add a @hide API to indicate 5G and DSDS conflict." into rvc-dev am: e9dc36d551 am: 23f35887a9" into rvc-d1-dev-plus-aosp am: f2f31ed45e am: e023bf8848
Change-Id: I79d993342bbf23e3b3051dbcee07abd63db6ef52
2020-04-14 23:13:37 +00:00
Xiangyu/Malcolm Chen
5bbcc479d1 Merge "Add a @hide API to indicate 5G and DSDS conflict." into rvc-dev am: e9dc36d551 am: 23f35887a9
Change-Id: I360d325de86ed5b913eb7f4da2ca64d2ff467b30
2020-04-14 22:35:15 +00:00
Xiangyu/Malcolm Chen
2565a56708 Merge "Add a @hide API to indicate 5G and DSDS conflict." into rvc-dev am: e9dc36d551
Change-Id: Ib19013fbbcbc3a499739ec56d5b6c2461befc3d8
2020-04-14 22:23:51 +00:00
Xiangyu/Malcolm Chen
e9dc36d551 Merge "Add a @hide API to indicate 5G and DSDS conflict." into rvc-dev 2020-04-14 22:17:28 +00:00
Malcolm Chen
e92ce14eb7 Add a @hide API to indicate 5G and DSDS conflict.
Bug: 152786064
Test: build and manual
Change-Id: I79a8fda5b70a31acc365ebcbb03b73b20d2443fd
2020-04-14 11:19:48 -07:00
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
e88497eb8c Merge "Only setup data when config and sim is ready" into rvc-dev am: 8f19a55f50
Change-Id: I36329d71b79c7c2e46f76589a33af0b8017e84f6
2020-04-08 08:34:23 +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
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
vivi.li
cabb1d4761 DUT fail to unlock SIM after selecting Home IMSI from STK When unlock SIM pin,SIM begin refresh,
and the UiccCardApp was disposed.

But the unlock process was canceled. Therefore,
the previous unlocking process was interrupted without returning,
and the keyguard PIN lock View was always displayed.
If UiccCardApp was disposed,send the CommandException.Error.ABORTED as result for the previous Message.

Test: manual
Bug:140907125

Change-Id: I61f63136cb8638566f612a0a459adb398294527f
2020-04-07 11:47:12 +08: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
d72172d5de Merge "Use an original text for next force 7bit encoding" 2020-04-07 02:32:15 +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
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
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
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
Nazish Tabassum
64056e1262 SIM De-personalization
Added constant support to framework for sim deperso

Test: make
Bug: 69389695
Change-Id: Ia7b9ca82570c1c9a9fed945d687e4bec4e87b3a1
2020-03-31 15:05:16 -07:00