Commit Graph

6921 Commits

Author SHA1 Message Date
Xiangyu/Malcolm Chen
8ed3fb4bcf Merge changes from topic "getDeviceCapableModemCount"
* changes:
  Rename and publicize getMaxPhoneCount; and deprecate getPhoneCount.
  Add public intent ACTION_MULTI_SIM_CONFIG_CHANGED.
2019-10-29 22:54:26 +00:00
Jack Yu
e750b5b659 Merge "Addition of 'XorEqualsString' method for comparing String" 2019-10-29 21:12:26 +00:00
Treehugger Robot
8c6e9e653d Merge "Expose APIs required by CarrierDefaultApp as system APIs." 2019-10-29 20:06:27 +00:00
Malcolm Chen
387dc0efd1 Rename and publicize getMaxPhoneCount; and deprecate getPhoneCount.
To have better names reflecting what getPhoneCount / getMaxPhoneCount
actually represent, we replace them with getActiveModemCount and
getSupportedModemCount. As getPhoneCount is public API, we mark
it as @Deprecated.

Bug: 141388730
Test: build
Change-Id: If086c50ae803b384691f709057bceeac2fc1d9d5
Merged-In: If086c50ae803b384691f709057bceeac2fc1d9d5
2019-10-29 12:19:32 -07:00
Malcolm Chen
64ff73fe4d Add public intent ACTION_MULTI_SIM_CONFIG_CHANGED.
ACTION_MULTI_SIM_CONFIG_CHANGED will be sent when multi-SIM
variants change.

Bug: 141388730
Test: test app
Change-Id: I717482ea05571afdfe6b04318d3f1fbda0c177ed
Merged-In: I717482ea05571afdfe6b04318d3f1fbda0c177ed
2019-10-29 12:15:59 -07:00
yoonjeong Jang
bc97964aad Addition of 'XorEqualsString' method for comparing String
Previously, ApnSetting compared two APNs using String with 'XorEqual' method
and the result of it used for 'dedupeApnSettings' for DcTracker.
For instance, a MMS APN for the specific operator shall be merged with
the default(Internet) APN of the same operator's(mccmnc) APN once the result of 'similar' is true.
But recently, it didn't merge two similar APNs properly due to 'UNSPECIFIED_STRING' case.
So we've added XorEquals for String(XorEqualsString) case.

The Issue will happen in the circumstance below.
 1.A network operator's similar APNs are saved separately at the APN database(apns-conf.xml)
    For instance, Add two APNs like below and check the result of merging APNs at DcTracker.
        <apn carrier="SKT LTE INTERNET"
          mcc="450"
          mnc="05"
          apn="lte.sktelecom.com"
          type="default,supl,fota,cbs"
          protocol="IPV4V6"
         />
        <apn carrier="SKT LTE INTERNET"
          mcc="450"
          mnc="05"
          apn="lte.sktelecom.com"
          type="mms"
          mmsc="http://omms.nate.com:9082/oma_mms"
          mmsproxy="smart.nate.com"
          mmsport="9093"
          protocol="IPV4V6"
         />:q
 2. Two similar APNs shall be merged on the result of ApnSetting's 'similar' method.
         P  => merged
         Q  => not merged

Test: Manual

Change-Id: I0584310765e246ef16163201282d7db48c44e451
Signed-off-by: yoonjeong Jang <yjeong.jang@samsung.com>
2019-10-29 13:00:28 +09:00
Peter Wang
8db38c9ef6 Merge "Fix java doc for eraseSubscriptionsWithOptions" 2019-10-28 22:50:53 +00:00
Jack Yu
48ad8828d1 Merge "Add new carrier configuration for GET INPUT command" 2019-10-28 22:06:43 +00:00
Peter Wang
fa9c61ad2d Fix java doc for eraseSubscriptionsWithOptions
Bug: 143138878
Test: on device
Change-Id: I7fe32bb1e09ea37a8c8a91fb7d7e820491c71803
Merged-In: I7fe32bb1e09ea37a8c8a91fb7d7e820491c71803
2019-10-28 12:37:56 -07:00
Peter Wang
ca01a7ee08 Merge "Add EuiccCardManager.ResetOption to eraseSubscriptions" 2019-10-28 19:32:18 +00:00
Xin Li
b2198fa670 Merge "Merge Coral/Flame into AOSP master" 2019-10-27 04:44:29 +00:00
Yoshiaki Naka
1c5203a65b Add new carrier configuration for GET INPUT command
The characters 0 to 9, *, # and + are accepted in the digit only mode of
GET INPUT/INKEY commands according to the 3GPP/ETSI standard, but only
numeric charactrers 0 to 9 are used in some actual use-cases. It must be
confusing to display all the allowed characters including *, # and + as
the helper text on the input screen in that case, so whether to display
the allowed characters must be configurable.

Bug: 128890104
Test: Confirmed the expected behavior in manual test cases.

Change-Id: I97ed3dd538c55f48eb05dad96e4836a48a295675
2019-10-26 17:44:19 +00:00
Peter Wang
2ab852d411 Add EuiccCardManager.ResetOption to eraseSubscriptions
Bug: 139474431
Test: on device
Change-Id: Ib8496ed6dbc6179940892de8df7901e84dd67d76
Merged-In: Ib8496ed6dbc6179940892de8df7901e84dd67d76
2019-10-25 14:26:22 -07:00
Chen Xu
17518fa149 Merge "move CellBroadcastMessage from telephony-common to app" 2019-10-25 17:28:22 +00:00
Chen Xu
7e902363a6 Merge "make CallerInfo as SystemAPI" 2019-10-25 17:27:45 +00:00
Yincheng Zhao
02f0815ddc Merge "Adding API in TelephonyManger for updating Fplmns."
am: 32eb91717f

Change-Id: I6f1ec15774320b08238c9338ff849b7528c120a6
2019-10-24 14:38:49 -07:00
Yincheng Zhao
32eb91717f Merge "Adding API in TelephonyManger for updating Fplmns." 2019-10-24 20:50:27 +00:00
Michele
7d3017002f Expose APIs required by CarrierDefaultApp as system APIs.
Test: compilation
Bug: 140580265
Change-Id: I3c678522e70b5d89a6a5a8f6bdb1e3fd91ca8aee
Merged-In: I3c678522e70b5d89a6a5a8f6bdb1e3fd91ca8aee
2019-10-24 00:25:57 +00:00
Chen Xu
fba9ca44a2 make CallerInfo as SystemAPI
1. move CallerInfo from telephony.internal to andorid.telephony package
2. expose APIs inside CallerInfo which are consumed by non-telephony
code.

Bug: 140908357
Test: Build
Change-Id: Ie95897c77e97e40f5357c107aede82edfea44d5a
(cherry picked from commit b9a1eefec6)
Merged-in: Ie95897c77e97e40f5357c107aede82edfea44d5a
2019-10-21 21:39:58 -07:00
Yincheng Zhao
def0631caf Merge "Changed regex matching for MCC and MNC"
am: 5ffb4ad657

Change-Id: I64b9c2bb033f6469a837689ebc603be5be5aff75
2019-10-21 13:21:30 -07:00
Yincheng Zhao
5ffb4ad657 Merge "Changed regex matching for MCC and MNC" 2019-10-21 19:42:47 +00:00
Chen Xu
a6379bcd18 move CellBroadcastMessage from telephony-common to app
1. add slotIndex in SmsCbMesage
2. move cellbroadcastMessage from telephony-common to app
next step, considering merging CellBroadcast to SmsCbMessage

Bug: 135956699
Bug: 141962867
Test: build & unit test
Change-Id: I07604101e3dccaa8e1539fa2644ef08da54d4533
(cherry picked from commit 515285b1b5)
Merged-in: I07604101e3dccaa8e1539fa2644ef08da54d4533
2019-10-19 20:36:26 -07:00
Jordan Liu
09a3b50108 Merge "[DO NOT MERGE] Add CellBroadcastService and related permissions"
am: 6af905e0fe

Change-Id: I166c9396c5b4d194cb2510a454005dc83b442247
2019-10-18 16:29:57 -07:00
Jordan Liu
7aea30267c [DO NOT MERGE] Add CellBroadcastService and related permissions
CellBroadcastService is bound to by the platform to handle cell
broadcasts.

Bug: 135956699
Test: manual
Change-Id: I865c09d6d246779b706c06371df685d415618699
2019-10-18 14:20:50 -07:00
Tyler Gunn
ca3bd1aba6 Add disconnect causes for WFC use cases.
Add new disconnect cause used when an attempt is made to place an
emergency call over WFC but the service is unavailable.
Add new disconnect cause when WFC is not available in an area.

Bug: 128993720
Test: Unit tests added to confirm remapping.
Change-Id: I15dcff8fabc06b5d469d083b0970fe0e77e7d318
Merged-In: I8c452c8e12f6ac3549480635132eab9d2ba03e2c
2019-10-18 18:07:40 +00:00
yincheng zhao
da2ec5ccb1 Adding API in TelephonyManger for updating Fplmns.
Bug: 78790236
Test: Verified on blueline
Change-Id: Id19ae55cc03efbd085314e9d0026ca2486e9755d
Merged-In: Id19ae55cc03efbd085314e9d0026ca2486e9755d
(cherry picked from commit c245257cb1)
2019-10-17 20:08:37 -07:00
Sarah Chin
2c3a62d878 Changed regex matching for MCC and MNC
Bug: 137942727
Test: atest CellIdentityTest
Change-Id: Iaeb9ff9e2a5a82be66855378831cd52ee49e3c5c
(cherry picked from commit cb76b14fdf)
Merged-In: Iaeb9ff9e2a5a82be66855378831cd52ee49e3c5c
2019-10-17 20:03:49 -07:00
Brad Ebinger
7dacb11cb5 Merge "Add CarrierConfig of voicemail number for roaming and IMS unregistered"
am: 637c07424f

Change-Id: I4c0ac6c03b885744f05ea3876be8e86b7e7c4066
2019-10-16 16:04:17 -07:00
Brad Ebinger
637c07424f Merge "Add CarrierConfig of voicemail number for roaming and IMS unregistered" 2019-10-16 22:54:54 +00:00
Hall Liu
510f917b94 Merge changes from topics "add-certs-cp", "feature_BusyTone_for_DisconnectCause"
am: 15ddba32e0

Change-Id: Iaf41586e1eb679a003ba4fc52c4413617c71e7a7
2019-10-15 17:08:32 -07:00
Hall Liu
15ddba32e0 Merge changes from topics "add-certs-cp", "feature_BusyTone_for_DisconnectCause"
* changes:
  Add new carrier config to extend DisconnectCause to play busy tone
  add certs to carrier configs and store them as UiccAccessRules
2019-10-15 23:46:17 +00:00
Nathan Harold
32d164ba41 Merge "[DO NOT MERGE] Check CellInfoCallback Detail for Null"
am: 994f656312

Change-Id: I04af3edc7430db678bb1fb3f53d3f245d16f5f7d
2019-10-15 15:45:04 -07:00
Nathan Harold
994f656312 Merge "[DO NOT MERGE] Check CellInfoCallback Detail for Null" 2019-10-15 22:29:52 +00:00
Xiangyu/Malcolm Chen
fd5d074f49 Merge "Remove isActivePhoneId as it's moved to PhoneConfigurationManager."
am: 6ddfde96fd

Change-Id: Id0b4e6388a93e0cdc142ee44fea087031098419a
2019-10-15 13:40:04 -07:00
Xiangyu/Malcolm Chen
6ddfde96fd Merge "Remove isActivePhoneId as it's moved to PhoneConfigurationManager." 2019-10-15 20:15:24 +00:00
Nathan Harold
fff052067c [DO NOT MERGE] Check CellInfoCallback Detail for Null
In cases where the source of the CellInfo fails
but does not generate a Throwable, the detail info
will not be provided and should be null. Inside the
user process, we need to check for null before
dereferencing the detail object. Oops. :-(

Bug: 142706765
Bug: 142421696
Test: manual
Change-Id: I1307d1d7aacef0bbd33bfc73700ee774e12e64c1
2019-10-15 12:49:37 -07:00
Xiangyu/Malcolm Chen
cc2d8d495d Merge changes from topic "141388730"
am: 50c4313058

Change-Id: I0765cc4847d91a6902668756a31c7011bc5b4a54
2019-10-15 11:11:04 -07:00
Xiangyu/Malcolm Chen
50c4313058 Merge changes from topic "141388730"
* changes:
  In CarrierTextController replace getPhoneCount with getMaxPhoneCount.
  Replace getPhoneCount with getMaxPhoneCount upon object allocation.
2019-10-15 17:57:49 +00:00
Saki Oomori
a70040841a Add new carrier config to extend DisconnectCause to play busy tone
This carrier config is used to specify additional DisconnectCause for
playing busy tone.

Bug: 116189822
Test: manual - Checked that busy tone is played according to
"KEY_DISCONNECT_CAUSE_PLAY_BUSYTONE_INT_ARRAY".
Change-Id: I58afb08ddc718bfb23d6c8b4f248c4c05d084829
2019-10-14 18:20:54 -07:00
Nazanin Bakhshi
693cec2025 add certs to carrier configs and store them as UiccAccessRules
Bug: 138388637
Test: tested with local override and made sure they are read and parsed
Change-Id: I50fb11444f0da33ae48683b834e6ca50941ad1b7
Merged-In: I50fb11444f0da33ae48683b834e6ca50941ad1b7
2019-10-14 18:17:12 -07:00
Xiangyu/Malcolm Chen
b9732abea7 Merge changes Icc6e7da7,I9007978b,I060511af
am: 8dbe1f3b9b

Change-Id: I1914c74c1ab66855dee063d18044473e298bee1f
2019-10-14 14:34:25 -07:00
Malcolm Chen
55bcdfeb34 Remove isActivePhoneId as it's moved to PhoneConfigurationManager.
Bug: 141388730
Test: unittest
Change-Id: Idf7babd3ad0bcbde04b2a92761acf31ec9776a50
Merged-In: Idf7babd3ad0bcbde04b2a92761acf31ec9776a50
2019-10-14 14:19:05 -07:00
Malcolm Chen
f87292fa52 Replace getPhoneCount with getMaxPhoneCount upon object allocation.
As first step for smooth single SIM to DSDS switch, for DSDS capable
deviced we always allocate objects as if it's in DSDS mode. For example
there will be two Phone objects.
Later we'll evaluate to make the allocations dynamic to save memory.

Bug: 141388730
Test: unittest and manual
Change-Id: I3064eb616371f60776a2930c113582562d206123
Merged-In: I3064eb616371f60776a2930c113582562d206123
2019-10-14 14:19:05 -07:00
Hunter Knepshield
4f5bb32fca Check Carrier Privilege on Hidden Subs
When calling CheckCarrierPrivilegeForAnySubId the
hidden subscriptions were not being taken into account
due to getAllActiveSubscriptionIds being a public method
that intentionally ignores hidden subscriptions.

NOTE: This is identical to ag/8193293, except that the
SubscriptionManager modifications don't make
getActiveSubscriptionIdList() static (it was causing test failures). A
further bug can be pursued to make everything static all at once.

Bug: 135684437
Test: manual
Change-Id: Iad6a3c2635e5eac2d33a16aa460b98394fd817f4
Merged-In: Iad6a3c2635e5eac2d33a16aa460b98394fd817f4
2019-10-14 14:15:09 -07:00
Xiangyu/Malcolm Chen
8dbe1f3b9b Merge changes Icc6e7da7,I9007978b,I060511af
* changes:
  Add APIs to return max possible active phones.
  Combine getPhoneCount, getSimCount and isMultiSimEnabled.
  Remove permission check for LISTEN_ACTIVE_DATA_SUBSCRIPTION_ID_CHANGE
2019-10-14 21:06:13 +00:00
Malcolm Chen
793928c338 Add APIs to return max possible active phones.
This is first step towards reboot free single SIM to DSDS switch. As
getPhoneCount returns active phone count based on current configuration,
getMaxPhoneCount (subject to renaming) will return max possible active
phones(logical modems).

Bug: 141023026
Test: manual

Change-Id: Icc6e7da7c065eb3f72ec85a99ccc148639c574da
Merged-In: Icc6e7da7c065eb3f72ec85a99ccc148639c574da
2019-10-14 11:57:12 -07:00
Malcolm Chen
f6da74661c Combine getPhoneCount, getSimCount and isMultiSimEnabled.
Bug: 141023026
Test: build
Change-Id: I9007978bc577a24083e0108d02c8b59fd16ae81f
Merged-In: I9007978bc577a24083e0108d02c8b59fd16ae81f
2019-10-14 11:55:55 -07:00
Malcolm Chen
118b02f61b Remove permission check for LISTEN_ACTIVE_DATA_SUBSCRIPTION_ID_CHANGE
Bug: 140020981
Test: sanity
Change-Id: I060511af068bfbbc9fea5c5d27a5d04eb2924fda
Merged-In: I060511af068bfbbc9fea5c5d27a5d04eb2924fda
2019-10-14 11:54:29 -07:00
Brad Ebinger
f9f5ebd9ca Merge "Fix annotations in ImsSmsImplBase"
am: 90f4c2abe4

Change-Id: I81e572a926e92d75d83fbf3b169772635c733c15
2019-10-11 11:11:17 -07:00
Brad Ebinger
90f4c2abe4 Merge "Fix annotations in ImsSmsImplBase" 2019-10-11 17:47:54 +00:00