Commit Graph

1226 Commits

Author SHA1 Message Date
Ta-wei Yen
85663d7edf Merge "Switch VVM SMS filter to Builder pattern" into nyc-mr1-dev 2016-05-25 00:13:06 +00:00
Ta-wei Yen
67ab168b78 Switch VVM SMS filter to Builder pattern
Bug:27816386
Change-Id: I74c73f0a43530dc563df29f0df7ae1a40845e8f0
2016-05-24 15:25:16 -07:00
Meng Wang
64997623bf Add API setAllowedCarriers, getAllowedCarriers to TelephonyManager
Also:
   Add RIL constants RIL_REQUEST_SET_ALLOWED_CARRIERS, RIL_REQUEST_GET_ALLOWED_CARRIERS

Bug: 28564314
Change-Id: Iaf6c40de633e767309c4088249a5c13cb0988c5c
2016-05-20 13:18:41 -07:00
Sanket Padawe
096e99e25c Merge "Add new TelephonyManager api to query Telephony metrics." into nyc-mr1-dev 2016-05-20 16:47:05 +00:00
Ta-wei Yen
621b68a213 Merge "Rename visual voicemail sync intent value" into nyc-dev
am: 0f712b164f

* commit '0f712b164fa24efdf5c5c2b20d939c3e7affbfe3':
  Rename visual voicemail sync intent value

Change-Id: I3c842deef20bcc0258affa2ca7d2241502ec49f6
2016-05-20 01:06:03 +00:00
Sanket Padawe
06e1ae1a51 Add new TelephonyManager api to query Telephony metrics.
Bug: 28717269
Change-Id: I6f5e88509feda879162049955776cb61dda8c840
2016-05-18 16:51:49 -07:00
Tyler Gunn
beb8c4954d Merge "Continued multi-endpoint work." into nyc-mr1-dev 2016-05-18 20:22:07 +00:00
Ta-wei Yen
153fcd7ba1 Rename visual voicemail sync intent value
Rename value of KEY_VVM_CELLULAR_DATA_REQUIRED_BOOL KEY_VVM_PREFETCH_BOOL

Change-Id: I13718333a8ddc38e8d2131b478562b76cf9aab64
Fixes:28819765
Fixes:28822093
2016-05-17 15:57:20 -07:00
Vineeta Srivastava
db41be8ef4 Merge "wifi calling emergency address carrier config" into nyc-mr1-dev 2016-05-17 20:18:03 +00:00
Vineeta Srivastava
c7d7ab7fab wifi calling emergency address carrier config
Add a carrier config for providing emergency address to carriers for
WiFi Calling use case.

Bug: 28404126
Change-Id: I33ed973d5ce6c9503412d5d97aa7278aaae888b5
2016-05-16 10:49:01 -07:00
Ta-wei Yen
349f4eddf7 Add visual voicemail SMS filter APIs
Added the following APIs to the framework:
VoicemailContracts.ACTION_VOICEMAIL_SMS_RECEIVED
VoicemailContracts.EXTRA_VOICEMAIL_SMS_TYPE
VoicemailContracts.EXTRA_VOICEMAIL_SMS_DATA
VoicemailContracts.EXTRA_VOICEMAIL_SMS_SUBID

TelphonyManager.setVisualVoicemailSmsFilterEnabled()
TelphonyManager.isVisualVoicemailSmsFilterEnabled()
TelphonyManager.setVisualVoicemailSmsFilterPrefix()
TelphonyManager.getVisualVoicemailSmsFilterPrefix()
TelphonyManager.setVisualVoicemailSmsFilterOriginatingNumbers()
TelphonyManager.getVisualVoicemailSmsFilterOriginatingNumbers()
TelphonyManager.setVisualVoicemailSmsFilterDestinationPort()
TelphonyManager.getVisualVoicemailSmsFilterDestinationPort()
TelphonyManager.VVM_SMS_FILTER_DESTINATION_PORT_ANY
TelphonyManager.VVM_SMS_FILTER_DESTINATION_PORT_DATA_SMS

These values are required to implement the VisualVoicemailSmsFilter in
frameworks/opt/telephony

All of the APIs are hidden.

Bug:27816386
Bug:27817303
Change-Id: I07736785da5fece84d1f3d27f270ac6fa94c1c56
(cherry picked from commit ecbcce11ce)
2016-05-16 17:37:48 +00:00
fionaxu
ea88c4c2fa Merge "disable wifi only mode from wfc setting for nyc" into nyc-dev
am: 8fde916de8

* commit '8fde916de89b5f0e777f687f3290976ec124faa5':
  disable wifi only mode from wfc setting for nyc

Change-Id: Ie74e4e0017ce4d514d5d458e05c2b226164a3bb6
2016-05-12 23:05:55 +00:00
Chen Xu
8fde916de8 Merge "disable wifi only mode from wfc setting for nyc" into nyc-dev 2016-05-12 22:57:40 +00:00
fionaxu
dcf5c2b8e2 disable wifi only mode from wfc setting for nyc
Bug: 28691529
Change-Id: I78a5606b213628148218cb5e9db63192a15384d7
2016-05-12 13:40:05 -07:00
Youhan Wang
7717acd174 Add getEsn().
Bug:27612001
Change-Id: I0cb61cd8a7604e2cc6959b181672fe63a1673447
2016-05-11 18:49:53 -07:00
Tyler Gunn
825da238c5 Continued multi-endpoint work.
1. Adding telephony disconnet cause for use when a call was pulled.
2. Added helped method to phone number utils which can be used to reformat
a telephony number stored as a SIP URI into a tel URI.

Bug: 27458894
Change-Id: Idef25bbc7b80258b361eb913d4c94b8bb34d7a4a
2016-05-10 20:04:27 -07:00
Tyler Gunn
8b38b22066 Merge "Add new carrier config option for video conference support." into nyc-mr1-dev 2016-05-11 01:17:24 +00:00
Youhan Wang
d4ddc7bcc1 Merge "Add getAidForApptype()." into nyc-mr1-dev 2016-05-09 17:04:57 +00:00
Nathan Harold
43864702b6 Merge "Coerce 8-bit bsic to Integer if Invalid" into nyc-dev
am: 08acd3ce28

* commit '08acd3ce28ff34f5a49d693b4c1144d967208e67':
  Coerce 8-bit bsic to Integer if Invalid

Change-Id: Ib1cf6ecce437c8198da169fd5a4f0d1301e1547e
2016-05-06 03:31:30 +00:00
Nathan Harold
f0db11324a Merge "CellInfo Parceling for Invalid Values" into nyc-dev
am: 5b45c62a1a

* commit '5b45c62a1a13801ed4c5fd228976928b30f63867':
  CellInfo Parceling for Invalid Values

Change-Id: I049eabf4ede20f591fd193e133e62444c1185fb7
2016-05-06 03:31:28 +00:00
Youhan Wang
2da9b2b8bf Add getAidForApptype().
To TelephonyManager and ITelephony.aidl.

Bug:27612001
Change-Id: Icb9dc5e29f3a635b2d807e8abcd15a5e1a85b02d
2016-05-05 16:12:58 -07:00
Nathan Harold
a326a4827e Coerce 8-bit bsic to Integer if Invalid
Bug: 28299027
Change-Id: I1ff3314844991cf49cab6099a7a4c436980d52c9
2016-05-05 16:04:56 -07:00
Nathan Harold
efbb8f3376 CellInfo Parceling for Invalid Values
Within CellInfo Fields, Integer.MAX_VALUE should indicate
that a field is not present in a report. This change makes the
invalid value consistent, and also ensures that it is checked
in the calculation of power levels / asu.

-Update parcel/unparcel functions to avoid -MAX_VALUE
-Update LTE and CDMA asuLevel() and level() functions to be
 consistently aware of the possibility of incomplete information

Bug: 27946114
Change-Id: Iacdc85db894e4a7809da8b5dc759488a1b6321ea
2016-05-05 16:04:56 -07:00
Jack Yu
597be61652 Merge "Added additional cbs channels support" into nyc-mr1-dev 2016-05-05 21:00:49 +00:00
Jack Yu
bf0fd7243b Added additional cbs channels support
Added a new carrier config that allows carriers to enable
additional cell broadcast channels for CMAS.

bug: 21107166
Change-Id: I2bdce880dfb6a2d8d8e9e252d1f331f657f63ccc
2016-05-03 11:53:30 -07:00
Amit Mahajan
fc6a3ad85b Merge "Change to return phone count as 0 if voice, sms, data not supported." into nyc-dev 2016-05-02 21:37:07 +00:00
Chen Xu
73efde04ef Merge "Add CarrierConfig for metered roaming" into nyc-dev 2016-04-26 22:42:18 +00:00
Amit Mahajan
2c222510f6 Change to return phone count as 0 if voice, sms, data not supported.
If any of the 3 is supported, and multi-sim capabilities are unknown,
return 1.

Bug: 23016052
Change-Id: Id19aaf33d9a86fc24116704c668977c727c2a1f2
2016-04-25 10:33:34 -07:00
Ta-wei Yen
8431a48f77 Merge "Rename _BOOLEAN visual voicemail config keys to _BOOL" into nyc-dev 2016-04-22 22:43:59 +00:00
Junda Liu
cc69bed61f Merge "Add comments to apptype and authtype constants." into nyc-dev 2016-04-22 19:05:35 +00:00
fionaxu
28ffb600db Add CarrierConfig for metered roaming
Bug: 26317905
Change-Id: Ib243de266736598cecdb8bcf76ac4db7275a1c01
2016-04-22 10:09:50 -07:00
Junda Liu
c7004f5648 Add comments to apptype and authtype constants.
Bug: b/28296053
Change-Id: Ib79d9106ac4415f495fd3ec4d0bea036d0b9c9f4
2016-04-21 10:05:21 -07:00
Nathan Harold
f6496db8ce Merge "Additional checks for ModemActivityInfo.isValid()" into nyc-dev 2016-04-21 02:09:28 +00:00
Ta-wei Yen
3f9306fe84 Rename _BOOLEAN visual voicemail config keys to _BOOL
Bug:28294644
Change-Id: I1a512008c7e42041f87416782c023348f5dd8693
2016-04-20 14:46:20 -07:00
Nathan Harold
98a40d3ca6 Additional checks for ModemActivityInfo.isValid()
Added checks in isValid for:
-A non-empty report
-Valid individual TxTime values
-Valid RxTime
-Valid EnergyUsed

Bug: 28278425
Bug: 28247832
Change-Id: I294fc200e81c828fbdd0e92b9ac4ae96fd7db6dc
2016-04-20 12:41:32 -07:00
Trevor Johns
59c9a93fc2 Merge changes from topic 'merge_docs_nyc-dev' into nyc-dev
* changes:
  Remove links to createAndInitializeUser() and createUser()
  Resolve merge conflicts of a5060ee to nyc-dev
2016-04-20 18:35:57 +00:00
Chen Xu
771fbfef27 Merge "Cold Sim issue fix" into nyc-dev 2016-04-20 00:10:01 +00:00
Tyler Gunn
ee61c6232e Add new carrier config option for video conference support.
- Default to off.
- @hide for now until we know whether we can bump the API rev for the DR.

Bug: 27658118
Change-Id: Ie0eda180f0a50b8f7026fce9eac8903f9a82eef5
2016-04-19 16:17:19 -07:00
fionaxu
b5592dc9f4 Cold Sim issue fix
Bug: 25203607
Change-Id: Ibde6a483477cb7c94f75b656d5e41748b13b23b2
2016-04-19 14:24:56 -07:00
Trevor Johns
682c24e228 Resolve merge conflicts of a5060ee to nyc-dev
This undoes the automerger skip which occured in
commit e740c84dc3 and
replays it as a standard (NOT -s ours) merge.

Change-Id: If5a47be26f73d6a0735c425cd66310a3e2a89086
2016-04-19 02:03:59 -07:00
Adam Lesinski
0d47f4b646 Merge "BatteryStats: Introduce Async external stats requests" into nyc-dev 2016-04-18 23:27:10 +00:00
Robert Greenwalt
951fe2925f Merge "Wifi: Introduce a configuration parameter to disable WiFi in ECBM" into nyc-dev 2016-04-18 16:27:52 +00:00
Robert Greenwalt
37c26e4d13 Merge "Handle mnc 00 while retrieving the Resources based on subid" into nyc-dev 2016-04-18 16:25:04 +00:00
Narayan Kamath
a09b4d2a61 Remove unnecessary allocation+unboxing of objects.
Transforming String->int can be done with 0 allocations
using Integer.parseInt.

bug: 28078871
Change-Id: I8d9f322d7154728849dde61ef282046032858d60
2016-04-18 09:55:59 +01:00
Sandeep Gutta
e1da5a3964 Handle mnc 00 while retrieving the Resources based on subid
Since mnc 00 is represented as undefined it needs to be replaced
with MNC_ZERO 0xffff for retrieving proper resources.

bug:28219719
Change-Id: I7e1630c2f5c31959306d862b10e7987bb449ea9f
2016-04-15 22:46:09 +00:00
Adam Lesinski
010bf374d8 BatteryStats: Introduce Async external stats requests
Instead of calling out to external processes with a blocking IPC,
pass along a Binder on which the external process can pass back
the response. The calling process can then wait for the reply with
a timeout.

This eliminates watchdog restarts of the system_server when an external
process like telephony or bluetooth hangs.

Bug:26842468
Change-Id: I1b242e4ed22a63f1a4a0be8c78de8ac4d7bf56c5
2016-04-15 15:27:52 -07:00
Sunil Dutt
7c5fda85af Wifi: Introduce a configuration parameter to disable WiFi in ECBM
This configuration parameter aims to address the following requirement.
a) If the Wifi radio on the UE is in turned on state (and the UE is not
   connected to any WWAN) and the user dials 911 and the UE is not
   capable of making E911-VoIP over WiFi calls, then the UE shall turn
   off its WiFi radio and shall try to attach to one of the WWANs,
   depending upon the air interfaces supported by the UE  for setting
   up the 911 call to the relevant PSAP. After the 911 call ends,and
   after the callback period ends, then the UE shall turn on the WiFi radio.

b) If the Wifi radio on the UE is in turned on state and the UE is connected
   to a WWAN and the user dials 911 and the UE is not capable of making
   E911-VoIP over WiFi calls, then the UE shall turn off its WiFi radio and
   shall set up the 911 call over the WWAN to which it is already attached,
   if that WWAN is available and able to support 911 calling. If that WWAN
   is not available or is not capable of supporting 911 calling, then the UE
   shall select an available WWAN for setting up the 911 call. Assumption is
   that while a LTE network may not have 911 calling support capability, all
   1x, GSM and UMTS networks will be 911 capable. After the 911 call ends,
   and after the callback period ends, then the UE shall turn on the WiFi radio.

c) If the Wifi radio on the UE is in turned on state (and the UE is not connected
   to any WWAN) and the user dials 911 and the UE is capable of making E911-VoIP
   over WiFi calls, then the UE shall not turn off its WiFi radio but shall first
   try to attach to one of the WWANs, depending upon the air interfaces supported
   by the UE , for setting up the 911 call to the relevant PSAP.

d) If the Wifi radio on the UE is in turned on state (and the UE is also connected
   to a WWAN) and the user dials 911 and the UE is capable of making E911-VoIP over
   WiFi calls, then the UE shall not turn off its WiFi radio but shall first try to
   attach to one of the WWANs, depending upon the air interfaces supported by the
   UE,for setting up the 911 call to the relevant PSAP.

Thus,the following address the requirement above.
1) Introduce a parameter (KEY_CONFIG_WIFI_DISABLED_IN_ECBM) to conifgure Wifi disable
   in ECBM for the requirement c & d. This key shall be overridden in the specific
   carrier overlay configuration file (defaulted to FALSE).
2) Already existing API (setWifiEnabled()) to turn ON/OFF Wi-Fi cater the requirement a & b .

Bug: 27854016
Change-Id: I5af370c143630bdd4b075f4730fd1de1bbe1fe7d
2016-04-15 13:32:14 -07:00
Pavel Zhamaitsiak
070b73a46d Merge "Consolidate WiFi Calling string resources" into nyc-dev 2016-04-14 17:16:41 +00:00
Junda Liu
a3df56450b Remove deprecated API for sim authentication.
The new getIccAuthentication should be used. All callers have been updated
to the new API. Remove the old API in this change.

Bug: b/27360179
Change-Id: I160974d53bb6477666b3e1d457accac45cc06bfc
2016-04-13 15:24:39 -07:00
Shishir Agrawal
c375dd43af Merge "Fixing few TelephonyManager calls to work when there is no SIM." into nyc-dev 2016-04-13 00:59:10 +00:00