Commit Graph

4466 Commits

Author SHA1 Message Date
Jack Yu
78b4100272 Reset cell broadcast config before enabling all channels
Before cell broadcast config service enabling all channels, it
reset all channels that were previously enabled. This will make
sure the full channel config can be pushed down to modem. This
also solved the issue that channel config not sending to modem
when SIM is swapped. Note that a hidden API is added and will
be unhide in the next Android release.

Fix: 155027085
Test: Manual
Merged-In: Id571b990f4e45aea5bbab0dbadce48dda7b2bc56
Change-Id: Id571b990f4e45aea5bbab0dbadce48dda7b2bc56
2020-06-18 23:42:45 +00:00
Sooraj Sasindran
1dfff63b39 Merge "Add hidden API to support allowed networks reason" into rvc-dev am: 06e61f7cd5
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11712805

Change-Id: Ia5e38013db7a64afc03b3564c1f336622e834e7c
2020-06-13 03:23:35 +00:00
Sooraj Sasindran
7e4cd920e7 Add hidden API to support allowed networks reason
Add hidden API to support allowed networks type for
specific reason like power.

Bug: 156709797
Test: system test
Change-Id: If4424d7d94ac26ad31725a1658dad5751d0d2629
2020-06-12 18:31:37 -07:00
Brad Ebinger
9ced939313 Merge "Fix MmTelFeatureConnection Memory Leak" into rvc-dev am: 0b35eb55a8
Change-Id: Id06fda9d0a3f3995c9497410e79ccb72c4862a43
2020-05-20 19:28:00 +00:00
Brad Ebinger
0b35eb55a8 Merge "Fix MmTelFeatureConnection Memory Leak" into rvc-dev 2020-05-20 19:07:49 +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
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
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
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
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
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
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
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
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
Sarah Chin
e55ef62c83 Add constants for NR_NSA, NR_NSA_MMWAVE
Used for LCE estimates

Test: build
Bug: 149864873
Change-Id: I0faed300c3a2640ef6675ed7497575fe4f364b2c
Merged-In: I0faed300c3a2640ef6675ed7497575fe4f364b2c
2020-03-31 12:27:09 -07:00
Jack Yu
412b479766 Merge "Get rid of SIM record access in DcTracker" into rvc-dev am: e3e18663f9
Change-Id: Id08aa41d326ff948191b935bc3832f1922e18bd1
2020-03-27 18:52:24 +00:00
Jack Yu
e3e18663f9 Merge "Get rid of SIM record access in DcTracker" into rvc-dev 2020-03-27 18:44:21 +00:00
Brad Ebinger
ee30a546d6 Merge "API fix: Rename and clarify ProvisioningManager constants" 2020-03-23 16:19:36 +00:00
Jack Yu
df3001b935 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
Change-Id: Iad45933ea77eb460625a891071535cbeaf8ac3b0
2020-03-22 02:41:25 -07:00
Philip P. Moltmann
98ddf9d4df Merge "Pipe through attributeTag for one SMS permission check" into rvc-dev am: 18122752c0
Change-Id: I956e2ab4782560ef054072a7da29de28e35b5615
2020-03-21 01:50:30 +00:00
Philip P. Moltmann
830833053d Pipe through attributeTag for one SMS permission check
Bug: 136595429
Test: TH
Change-Id: I346ac2d3acad0e0d18b298f89f0b96324fc52333
2020-03-20 10:46:07 -07:00
TreeHugger Robot
0b6c81800f Merge changes from topic "sms-attributeTag-rvc-dev" into rvc-dev
* changes:
  Set attribution tag in TelephonyManager#sendVisualVoicemailSmsForSubscriber
  Merge "Pipe through attributeTag for one self-permission check" am: 9ed7e7f1b1 am: 1bf1d39fa4 am: 6094f4258e am: 7fd121e139 am: b54512bca9
2020-03-20 02:09:28 +00:00
Sarah Chin
ea5d441e9f Merge "Add constants foor NR_NSA, NR_NSA_MMWAVE" into rvc-dev am: 7c753067f3
Change-Id: I5f0d49859e28d1981a74ee37a93a5e2e8ba20f73
2020-03-20 01:24:01 +00:00
Philip P. Moltmann
b36bcc882a Pipe through attributeTag for one SMS permission check
Bug: 136595429
Test: TH
Change-Id: I99635efd0da5e72c3df9c6383779a059bbe3c1d1
Merged-In: I346ac2d3acad0e0d18b298f89f0b96324fc52333
2020-03-20 00:28:09 +00:00
Philip P. Moltmann
f35af1fc36 Merge "Pipe through attributeTag for one self-permission check" am: 9ed7e7f1b1 am: 1bf1d39fa4 am: 6094f4258e am: 7fd121e139 am: b54512bca9
Bug: 136595429
Change-Id: I60bc87fac0070e6d3a749ae5fc8346d9f4f55da8
(cherry picked from commit 24b15eef74)
2020-03-19 16:19:49 -07:00
Philip P. Moltmann
6094f4258e Merge "Pipe through attributeTag for one self-permission check" am: 9ed7e7f1b1 am: 1bf1d39fa4
Change-Id: Ia7e265f35b45702b87a6776beb970a19b5d6665d
2020-03-19 20:29:30 +00:00
Philip P. Moltmann
9ed7e7f1b1 Merge "Pipe through attributeTag for one self-permission check" 2020-03-19 19:41:17 +00:00
Sarah Chin
152161ad00 Add constants foor NR_NSA, NR_NSA_MMWAVE
Used for LCE estimates

Test: build
Bug: 149864873
Change-Id: I0faed300c3a2640ef6675ed7497575fe4f364b2c
2020-03-18 19:10:41 -07:00
Philip P. Moltmann
a345428817 Pipe through attributeTag for one self-permission check
... Also remove unused aidl methods.

Bug: 136595429
Test: TH
Change-Id: I37bf62a83c1043acdc878f747ef85d719766f991
2020-03-18 18:16:22 -07:00