Commit Graph

6938 Commits

Author SHA1 Message Date
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
Ruijie Bai
66de282468 Returns null not empty string if MEID is not available
TelephonyManager#getMeid is defined to return null if MEID is not
available. However, it may return an empty string. Because Modem returns
an empty string if a device doesn't support CDMA. Therefore, change to
return null if MEID is empty.

Test: cts-tradefed run cts -m CtsDevicePolicyManagerTestCases -t 
com.android.cts.devicepolicy.MixedDeviceOwnerTest#testKeyManagement
Bug: 140472124

Change-Id: I822c352854516e898bbe3d7a6710ecb085991b1b
2019-10-11 17:57:14 +09: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
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
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
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
0c85ca1062 Merge "Fix race in TelephonyScanManager"
am: 884dd0f559

Change-Id: If79d695c2bdb83cf7c902bc540da5b8b427268f4
2019-10-09 11:36:41 -07:00
Treehugger Robot
884dd0f559 Merge "Fix race in TelephonyScanManager" 2019-10-09 18:20:14 +00:00
Jordan Liu
a2ca902d2f Merge "Add CellBroadcastService and related permissions"
am: 32382561a6

Change-Id: I158509f8c22b1ea5780d9dcae126f4bf32184564
2019-10-09 09:26:01 -07:00
Jordan Liu
b59c74f302 Add CellBroadcastService and related permissions
CellBroadcastService is bound to by the platform to handle cell
broadcasts.

Bug: 135956699
Test: manual
Change-Id: Ib1b20da03d271fc0b2736774b2ca6c6514944093
Merged-In: Ib1b20da03d271fc0b2736774b2ca6c6514944093
2019-10-08 11:20:46 -07:00
Hall Liu
418e7798ab 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-07 15:38:02 -07:00
Shuo Qian
05430c9d1f Merge "Change the Listener API names"
am: fe6978a73f

Change-Id: Icf860de451298632635ad15ba0d1c7701b83073e
2019-10-04 19:41:12 -07:00
Shuo Qian
d96637660f Change the Listener API names
Test: cts
Bug: 135204580
Change-Id: I1f64d6eb6b113ca85f43a3f6a578c68dbb8bd5ed
2019-10-04 13:24:23 -07:00
Shuo Qian
69eabb2397 Merge "Add both Emergency Number listener for testing"
am: 46cf71d1d0

Change-Id: I0973225c5125e0549757f609d52f58031e447f5d
2019-10-04 09:10:35 -07:00
Shuo Qian
650ff647e4 Add both Emergency Number listener for testing
Test: CTS
Bug: 135204580
Change-Id: Ifb20b9a20f9493fb7fe671c0fd2d8b4de7ea9f67
2019-10-03 15:09:00 -07:00
Hall Liu
f99b67b657 Merge "Add carrier config for allowing merge of RTT calls" 2019-10-02 23:43:15 +00:00
Hall Liu
657c80a322 Merge "Unbind MBMS service after calling close"
am: d00563735f

Change-Id: I9392f5d1c2922d373b0aef812cbc43ba1ef05848
2019-10-02 15:11:20 -07:00
Hall Liu
64a192b61f Add carrier config for allowing merge of RTT calls
Add a carrier config key that specifies whether merging an RTT call is
allowed.

Bug: 136035168
Test: manual

Change-Id: I8cfdf68c69b50abed88d7c835db0480a53755f5a
Merged-In: I8cfdf68c69b50abed88d7c835db0480a53755f5a
2019-10-02 21:56:57 +00:00
Hall Liu
d00563735f Merge "Unbind MBMS service after calling close" 2019-10-02 21:56:01 +00:00
James Lin
54e73b6e1a Merge "[RCS] Add carrier config "use_rcs_sip_options_bool" for check if SIP OPTIONS is supported"
am: 74ad1b81ab

Change-Id: I67c40753c0ae96893ed13e78f482782b4f67ccb2
2019-10-02 08:44:33 -07:00
James Lin
74ad1b81ab Merge "[RCS] Add carrier config "use_rcs_sip_options_bool" for check if SIP OPTIONS is supported" 2019-10-02 15:26:22 +00:00
Hall Liu
718986d929 Unbind MBMS service after calling close
Add a call to Context#unbindService in close() in the three MBMS session
classes so that we don't get a service binding leak.
Also add implementations of onNullBinding.

Fixes: 140144741
Test: manual
Change-Id: Ibde9fdbc096decb7b6ab7b60016645bc4810b859
2019-10-01 16:52:47 -07:00
Jordan Liu
94d4fcb7b3 Merge "Expose CdmaSmsCbProgramData as SystemApi"
am: e3dfe362dc

Change-Id: I8ff5254d03558c69bc0cd8fd57a7337349de6be2
2019-10-01 13:51:51 -07:00
Jordan Liu
e3dfe362dc Merge "Expose CdmaSmsCbProgramData as SystemApi" 2019-10-01 20:33:29 +00:00
James.cf Lin
9f5e1f7509 [RCS] Add carrier config "use_rcs_sip_options_bool" for check if SIP OPTIONS is supported
Bug: 139260798
Test: Manual
Change-Id: I93df866fe020d03130458175a8823368069c47e6
Merged-In: I875e597fa3cb5d7f5a93989d2ff8e4abbbd9d045
2019-10-02 03:25:39 +08:00
Brad Ebinger
05e03e8c0c Merge "Add Telecom command for setting connectionservice filter"
am: 25f4dca660

Change-Id: I00ba7ce3b64f4680eaf8798c52d98318160b45f0
2019-10-01 10:51:45 -07:00
Nathan Harold
e65e064e22 Merge "Add Debounce text to ACTION_NETWORK_COUNTRY_CHANGE"
am: c75cf96f72

Change-Id: I4485da245b76c4ed8fba638092912564acc0927e
2019-10-01 10:46:48 -07:00
Jordan Liu
4ae91c0308 Expose CdmaSmsCbProgramData as SystemApi
Only getOperation and getCategory are currently used, so we only expose
those parts of the functionality. Eventually if we move BearerData to
the CBR app we will also have to expose the constructor, at which point
we may also want to expose the other constants that the constructor
uses, but for now this is okay.

Bug: 135956699
Test: manual
Change-Id: I1d3ba564372845f9b8a470adf82e84df745c02a7
Merged-In: I1d3ba564372845f9b8a470adf82e84df745c02a7
2019-10-01 10:42:56 -07:00
Brad Ebinger
25f4dca660 Merge "Add Telecom command for setting connectionservice filter" 2019-10-01 17:30:40 +00:00
Nathan Harold
c75cf96f72 Merge "Add Debounce text to ACTION_NETWORK_COUNTRY_CHANGE" 2019-10-01 17:29:29 +00:00
Hall Liu
7fe39a8776 Merge "Add carrier config for ignoring user RTT setting"
am: e93165456c

Change-Id: I73a4ab7963525669ccc74ef634345077e0ce618f
2019-09-30 18:46:17 -07:00
Hall Liu
e93165456c Merge "Add carrier config for ignoring user RTT setting" 2019-10-01 01:37:05 +00:00