Commit Graph

10380 Commits

Author SHA1 Message Date
danielwbhuang
8cbbed00df Add more error codes.
Add error codes for setPreferredOpportunisticDataSubscription and updateAvailableNetworks

Test: run atest.
1.atest TelephonyManagerTest#testPreferredOpportunisticDataSubscription
[1/1] android.telephony.cts.TelephonyManagerTest#testPreferredOpportunisticDataSubscription: PASSED (1.662s)
2.atest TelephonyManagerTest#testUpdateAvailableNetworks
[1/1] android.telephony.cts.TelephonyManagerTest#testUpdateAvailableNetworks: PASSED (534ms)

Bug: 130595455
Change-Id: I6f386bfcf75236e30141fab89e2b62ee3a8cb59e
2019-11-20 15:06:01 +08:00
Peter Wang
29e4138c3c Merge "Fix java doc for eraseSubscriptionsWithOptions" 2019-10-24 01:15:15 +00:00
Xiangyu/Malcolm Chen
38a8eca46a Merge "Have getSupportedModemCount always rely on system properties." 2019-10-23 23:04:06 +00:00
Peter Wang
406cee2b72 Fix java doc for eraseSubscriptionsWithOptions
Bug: 143138878
Test: on device
Change-Id: I7fe32bb1e09ea37a8c8a91fb7d7e820491c71803
2019-10-23 11:14:46 -07:00
Brad Ebinger
70d67abe51 Merge "Remove shell commands for setting default SMS app" 2019-10-22 23:07:02 +00:00
Michele Berionne
54ecfe3a00 Merge "Expose APIs required by CarrierDefaultApp as system APIs." 2019-10-22 20:55:20 +00:00
TreeHugger Robot
d3192405df Merge "Change defaults for FREQUENCY_RANGE and NR_STATE" 2019-10-21 18:42:24 +00:00
Malcolm Chen
a416d984b0 Have getSupportedModemCount always rely on system properties.
Earlier we disabled the reboot free feature and always have
getSupportedModemCount return the same value with getActiveModemCount.
Now that we've enbaled reboot free switch, we will return correct value
based on system property.

Bug: 142514392
Test: manual - change PROPERTY_REBOOT_REQUIRED_ON_MODEM_CHANGE and test
what getSupportedModemCount returns.
Change-Id: I34e172c747dd52aa498037e64b758393793fddba
2019-10-18 17:08:09 -07:00
Meng Wang
aeda16fdf0 Merge "Expose TelephonyManager#getDeviceSoftwareVersion(int) as system API." 2019-10-18 21:06:56 +00:00
Sarah Chin
65277dfec2 Change defaults for FREQUENCY_RANGE and NR_STATE
Change value from -1 to 0 to match proto

Bug: 141323073
Test: atest TelephonyMetricsTest
Change-Id: I4509f22cdae656de3ad011de3a1664e27d35986a
2019-10-18 11:31:12 -07:00
Meng Wang
65f65b2d6d Expose TelephonyManager#getDeviceSoftwareVersion(int) as system API.
Bug: 142228257
Test: make
Change-Id: I1cddd570d5c1203ca749be0ac78093df9e97ee3b
2019-10-17 18:20:14 -07:00
TreeHugger Robot
1af9a728ff Merge "Make APIs in the base CellInfo class public." 2019-10-17 18:36:48 +00:00
Chen Xu
3321171cc7 Merge "non-mainline telephony related AIDL refactor/decoupling" 2019-10-17 18:27:13 +00:00
Brad Ebinger
6bb55a89b3 Merge "Add CarrierConfig of voicemail number for roaming and IMS unregistered" am: 637c07424f am: 7dacb11cb5 am: 9f0b529396
am: 5155061d42

Change-Id: Iccab0347c89f8015526bd7ba5de33672b0889766
2019-10-16 16:41:45 -07:00
Brad Ebinger
5155061d42 Merge "Add CarrierConfig of voicemail number for roaming and IMS unregistered" am: 637c07424f am: 7dacb11cb5
am: 9f0b529396

Change-Id: If3babb0133ebc2a6aa04fc52ac5d3c39f3e50b39
2019-10-16 16:29:13 -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
Chen Xu
1f6cfa5399 non-mainline telephony related AIDL refactor/decoupling
1. decouple IOnSubscriptionChangedListener AIDL from telephonyMainline
2. other refactor. moving APIs which will not be included in
telephony mainline to frameworks/base/core/java/android/telephony.
Moving internal classes like AIDL which will not be included in
telephony mainline to
framework/base/core/java/com/android/internal/telephony

Bug: 140908357
Test: Build & unit test
Change-Id: I9413ef758cceadd251d03f3b5ea1054cc48ef044
2019-10-16 15:30:24 -07:00
Amit Mahajan
54e43e65e0 Make APIs in the base CellInfo class public.
Test: build
Bug: 139417139
Change-Id: I591c500136ac1f28d9cb87cd1649fd891e1315f6
2019-10-16 10:27:27 -07:00
Tyler Gunn
9f2efe987e Merge "Add ITelephony setCepEnabled command line command." am: ae48da3c55 am: ec6047ad09 am: b4dfa6e2fb
am: f23f696991

Change-Id: Id1a82749d4224cf8ee479c1a42ab8967fbdffa0c
2019-10-15 23:59:37 -07:00
Tyler Gunn
f23f696991 Merge "Add ITelephony setCepEnabled command line command." am: ae48da3c55 am: ec6047ad09
am: b4dfa6e2fb

Change-Id: I0924d71b202109bad8e43a7c5160b05ac6c5f238
2019-10-15 23:53:26 -07:00
Tyler Gunn
ec6047ad09 Merge "Add ITelephony setCepEnabled command line command."
am: ae48da3c55

Change-Id: Ib532a5c16c29596131a6fbeb695fc2a7d59dd81b
2019-10-15 23:29:29 -07:00
Treehugger Robot
ae48da3c55 Merge "Add ITelephony setCepEnabled command line command." 2019-10-16 06:13:47 +00:00
Saki Oomori
02fca08ccc Add new carrier config to extend DisconnectCause to play busy tone
am: 63bb856162

Change-Id: I80224cbf453b156676458538cd0bc5c05be4a296
2019-10-15 21:23:30 -07:00
Saki Oomori
63bb856162 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-15 18:43:01 -07: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
a69d2946f0 Merge "[DO NOT MERGE] Check CellInfoCallback Detail for Null" am: 994f656312 am: 32d164ba41
am: e9fa64cc5c

Change-Id: I5dee65ea78b9fa8c528fc0d7a0de99f9cf67a2e9
2019-10-15 16:01:00 -07: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
Hall Liu
5210215286 Merge "Add ImsReasonInfo constant for retrying without RTT" into qt-qpr1-dev am: fe19a93016
am: 805b047be2

Change-Id: I8b81c51dc99680d9a02f986b6c239457c21fcd4e
2019-10-15 14:32:15 -07:00
Hall Liu
805b047be2 Merge "Add ImsReasonInfo constant for retrying without RTT" into qt-qpr1-dev
am: fe19a93016

Change-Id: Ie9a22097672630c6277c47f830459c9f3ecaf937
2019-10-15 14:25:18 -07:00
Xiangyu/Malcolm Chen
281e4ef4ec Merge "Remove isActivePhoneId as it's moved to PhoneConfigurationManager." am: 6ddfde96fd am: fd5d074f49
am: 914861c2e0

Change-Id: Ibcdf9922d0be31508f22cee3fc6e5b76d26f1df7
2019-10-15 14:04:56 -07: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
a99f27b4a4 Merge changes from topic "141388730" am: 50c4313058 am: cc2d8d495d
am: fd12f3d9bc

Change-Id: I38415b3b9c5d18c6801f7ef6abc53f0ee8e6c7e5
2019-10-15 11:55:24 -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
TreeHugger Robot
50beaa7608 Merge "Make getEcno() public." 2019-10-15 17:26:25 +00:00
Michele
61f098ecaf Expose APIs required by CarrierDefaultApp as system APIs.
Test: compilation
Bug: 140580265
Change-Id: I3c678522e70b5d89a6a5a8f6bdb1e3fd91ca8aee
2019-10-15 09:34:26 -07: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
Sarah Chin
11c0ef2c5e Merge "5G meteredness for telephony framework" 2019-10-14 23:31:42 +00:00
Xiangyu/Malcolm Chen
417ac2760b Merge changes Icc6e7da7,I9007978b,I060511af am: 8dbe1f3b9b am: b9732abea7
am: 2cd6c07dee

Change-Id: I63beda0fc9f67c34d907be9c692a327fea236fb1
2019-10-14 14:53:51 -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