Commit Graph

7278 Commits

Author SHA1 Message Date
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
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
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
Jordan Liu
9bbcca844b Merge "Pass bearerData and serviceCategory to CB module for CDMA" 2019-10-14 20:38:09 +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
Hall Liu
6652a265c7 Add ImsReasonInfo constant for retrying without RTT
Add CODE_RETRY_ON_IMS_WITHOUT_RTT for the IMS stack to indicate to
Telephony that a call should be retried without RTT enabled.

Bug: 141963475
Test: manual

Change-Id: Ic3aa8856e98d8c34fd98462d71834e69b857eda4
2019-10-12 01:04:42 +00:00
Amit Mahajan
3a3c09610a Make getEcno() public.
Test: atest CellInfoTest#verifyCellSignalStrengthWcdma
Bug: 139417139
Change-Id: Ic70af2ca0d60fbf43a929982d8b6853c7b7da049
2019-10-11 21:33:20 +00:00
Brad Ebinger
35919d5807 Merge "Fix annotations in ImsSmsImplBase" am: 90f4c2abe4 am: f9f5ebd9ca am: 0b37c14f40
am: 5525fd1924

Change-Id: Ia1f86f758e81e50c0a51d59d74d21fb1f695be67
2019-10-11 11:34:46 -07:00
Brad Ebinger
5525fd1924 Merge "Fix annotations in ImsSmsImplBase" am: 90f4c2abe4 am: f9f5ebd9ca
am: 0b37c14f40

Change-Id: Ie7ec40e4c37657a9a811fed180d56413213d85ef
2019-10-11 11:27:38 -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
Meng Wang
4a91bcffc4 Merge "Do not use hidden API ParcelableException" 2019-10-11 17:32:49 +00:00
Xiangyu/Malcolm Chen
07ec79849b Merge "Rename and publicize getMaxPhoneCount; and deprecate getPhoneCount." 2019-10-11 02:06:47 +00:00
Jack Yu
31c8eb6d24 Merge "Fix inconsistentcy API in CellInfoNr" am: 85de0791e4 am: a2edbe577c am: 47d397e28e
am: e05f762b42

Change-Id: I43dd060373aead510832d6ebb6cb814d342a0abc
2019-10-10 17:51:11 -07:00
Jack Yu
e05f762b42 Merge "Fix inconsistentcy API in CellInfoNr" am: 85de0791e4 am: a2edbe577c
am: 47d397e28e

Change-Id: Iaf13c8d20939fbc66a8a9210212c38e092e80bd6
2019-10-10 17:38:19 -07:00
Jack Yu
a2edbe577c Merge "Fix inconsistentcy API in CellInfoNr"
am: 85de0791e4

Change-Id: If59a8a3dd376bb63740c8272e8b3056bb75b8e4c
2019-10-10 17:14:15 -07:00
Jack Yu
85de0791e4 Merge "Fix inconsistentcy API in CellInfoNr" 2019-10-10 23:57:01 +00:00
Brad Ebinger
7da141d99b Merge "Fix ImsMmTelManager docs to use annotations" am: 63df8520ff am: 773209c5d2 am: 60e141526d
am: 16f43495d6

Change-Id: Ib8b8556e089cb6be8c86e2fc35511ed265a75799
2019-10-10 14:48:44 -07:00
Malcolm Chen
32f799da52 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
2019-10-10 14:36:35 -07:00
Brad Ebinger
16f43495d6 Merge "Fix ImsMmTelManager docs to use annotations" am: 63df8520ff am: 773209c5d2
am: 60e141526d

Change-Id: Id2887350169f55b02c2a7aa67f63e20dbd8792da
2019-10-10 14:35:18 -07:00
Brad Ebinger
773209c5d2 Merge "Fix ImsMmTelManager docs to use annotations"
am: 63df8520ff

Change-Id: If5bf6706405aeb25816827fdbbff68bf0ecd1d3f
2019-10-10 14:16:43 -07:00
Brad Ebinger
63df8520ff Merge "Fix ImsMmTelManager docs to use annotations" 2019-10-10 20:56:31 +00:00
Brad Ebinger
50c7b1bedf Fix annotations in ImsSmsImplBase
Bug: 141568452
Test: manual
Change-Id: Iad595b75d47dc9fd356e6362e3adbcb5815e375d
2019-10-10 13:25:03 -07:00
TreeHugger Robot
0b2114ea82 Merge "Make sure mTransmitPowerInfo is always populated" 2019-10-10 01:04:45 +00:00
Jordan Liu
6d64fc657f Pass bearerData and serviceCategory to CB module for CDMA
CDMA cell broadcast messages require the bearer data and service
category to be passed along for parsing. This CL updates the AIDL
interface so this info can be passed.

Bug: 135956699
Test: manual
Change-Id: I98f79fbb384881de5cb65fa7fe7a08b3f5b2e272
2019-10-09 16:13:12 -07:00
Peter Wang
95c3d10f3a Merge "Add EuiccCardManager.ResetOption to eraseSubscriptions" 2019-10-09 22:45:11 +00:00
Jordan Liu
96c51f58db Merge "[DO NOT MERGE] Revert "Add CellBroadcastService and related permissions"" am: 8172f45111 am: 21fedfab99
am: 87d2acb711

Change-Id: I0b26a92e8c15a710a54576f8ce499ae441748dde
2019-10-09 15:01:32 -07:00
Jordan Liu
21fedfab99 Merge "[DO NOT MERGE] Revert "Add CellBroadcastService and related permissions""
am: 8172f45111

Change-Id: Ieed5df537d2b6ff40c8a6b2c2bd7c8ab090c2e9a
2019-10-09 14:26:12 -07:00
Yincheng Zhao
6a98a37a3c Merge "Adding API in TelephonyManger for updating Fplmns." 2019-10-09 21:03:46 +00:00
Hall Liu
8718323a76 Fix race in TelephonyScanManager
TelephonyScanManager may sometimes encounter a race condition where
Telephony sends it the first scan result before it has saved the
returned scan ID. This causes a crash in the app that's requesting the
scan.

To fix this, synchronize on mScanInfo while requesting the network scan
so that the handler in TelephonyScanManager will wait for the scan ID to
be saved before processing the first message from Telephony.

Bug: 142068098
Test: manual
Change-Id: I0b2b4c6dc749e21641843818293941704ed870a6
2019-10-09 13:41:51 -07:00
Jordan Liu
656502be63 [DO NOT MERGE] Revert "Add CellBroadcastService and related permissions"
This reverts commit b59c74f302.

Reason for revert: depends on ag/9477322 being CP'd, or else causes breakages downstream (b/142399383)

Change-Id: I25b1695757d5fec8c00f05d033c33501f4fc5389
2019-10-09 13:34:26 -07:00
Hall Liu
75ab96a83f Merge "Fix race in TelephonyScanManager" am: 884dd0f559 am: 0c85ca1062 am: 8fd8b5b234
am: f67ba767a0

Change-Id: I321948af64ad9e6299d893647de77ff20d6f1363
2019-10-09 12:16:50 -07:00
Hall Liu
f67ba767a0 Merge "Fix race in TelephonyScanManager" am: 884dd0f559 am: 0c85ca1062
am: 8fd8b5b234

Change-Id: I21ba7e6502e06064a443a701b1953d3dff60b653
2019-10-09 12:08:46 -07:00
zhouwenjie
df0e41042c Make sure mTransmitPowerInfo is always populated
Currently mTransmitPowerInfo could be empty, which ends up with a
IndexOutOfBoundsException.

Bug: 141382585
Change-Id: I97417f539b2bfba98499cbf4b609ea7c088b808f
Test: atest CtsIncidentHostTestCases:com.android.server.cts.BatteryStatsValidationTest
2019-10-09 18:57:03 +00:00
Hall Liu
0c85ca1062 Merge "Fix race in TelephonyScanManager"
am: 884dd0f559

Change-Id: If79d695c2bdb83cf7c902bc540da5b8b427268f4
2019-10-09 11:36:41 -07:00