Commit Graph

3468 Commits

Author SHA1 Message Date
Shishir Agrawal
dc91e0f8c6 Merge "Fixing few TelephonyManager calls to work when there is no SIM." into nyc-dev
am: c375dd4

* commit 'c375dd43af95b8106c8384236f61b5868ec6233e':
  Fixing few TelephonyManager calls to work when there is no SIM.

Change-Id: Ic3a2f315ca5b6ad20ffb1fa886142ef773bc4b43
2016-04-13 01:02:25 +00: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
Jack Yu
8c5100e949 Merge "Moved ERI configuration files from resoures to Carrier Config." into nyc-dev
am: 3a2bce6

* commit '3a2bce6e51b08d276806cc60fb1a410e63b4e17e':
  Moved ERI configuration files from resoures to Carrier Config.

Change-Id: Ib9289d40191c205cfa95560b5a38f8fe8dfeef80
2016-04-12 23:50:21 +00:00
Jack Yu
3a2bce6e51 Merge "Moved ERI configuration files from resoures to Carrier Config." into nyc-dev 2016-04-12 23:43:22 +00:00
Shishir Agrawal
dc50a87495 Fixing few TelephonyManager calls to work when there is no SIM.
* getDeviceSoftwareVersion - Fixed to work for no SIM by not looking up subId.
* getImei - Fixed to work for no SIM by not looking up subId.
* getActivePhoneTypeForSlot - Adding a method (hidden).
* getCallState - Adding slotId version (hidden).

Bug: 27378995
Change-Id: Ib67ae3df5562d75727dc7e4ac023021fb331d3b5
2016-04-12 12:41:22 -07:00
Robert Greenwalt
ad1f6a7b0d Merge "Add settings for SUW data control." into nyc-dev
am: 6e1e880

* commit '6e1e880f001ab3663fba3a7b6d292387efaf7b8f':
  Add settings for SUW data control.

Change-Id: I9a919ae9d8a960fa1540f051221643a5af3307c4
2016-04-11 21:35:48 +00:00
Robert Greenwalt
6e1e880f00 Merge "Add settings for SUW data control." into nyc-dev 2016-04-11 21:28:01 +00:00
Jack Yu
360dc21585 Moved ERI configuration files from resoures to Carrier Config.
Used Carrier Config to load correct ERI configuration file since
there are MCC/MNC shared by different carriers.

bug: 23887558
Change-Id: I61632045486929a5f0f1266fcf3b772a969d5836
2016-04-11 13:58:56 -07:00
Jeff Davidson
41bec764a4 Merge changes from topic \'carrier-app-race\' into nyc-dev
am: b53874e

* commit 'b53874e71459af4461d12fa626a39d02d98cf2b3':
  Disable preinstalled carrier apps earlier in boot.
  Move CarrierAppUtils into frameworks/base/telephony.

Change-Id: If18687485c5467f305577c1fd401addae4fd487d
2016-04-11 18:07:11 +00:00
Jeff Davidson
b53874e714 Merge changes from topic 'carrier-app-race' into nyc-dev
* changes:
  Disable preinstalled carrier apps earlier in boot.
  Move CarrierAppUtils into frameworks/base/telephony.
2016-04-11 17:58:18 +00:00
Jack Yu
6754d237bb Merge "Excluded certain APNs (e.g. IMS) from mobile data usage." into nyc-dev
am: 2e062ab

* commit '2e062ab8de3bae82b76a3f3aaeac6994f2555fe5':
  Excluded certain APNs (e.g. IMS) from mobile data usage.

Change-Id: I72b09515578a1843009439b1a8fbccccaaf3ab4c
2016-04-09 03:37:54 +00:00
Jeff Davidson
e68b127525 Disable preinstalled carrier apps earlier in boot.
Preinstalled carrier apps start in state DEFAULT (== ENABLED); the
telephony stack marks them as DISABLED_UNTIL_USED during
initialization, and eventually ENABLED once a SIM for that carrier is
inserted.

However, this can cause a race as telephony initialization may happen
after the carrier app is started, while it is still in the DEFAULT
state. In this case, the app is disabled, and though PackageManager
will subsequently kill it, this may lead to a race as the app will
briefly remain running while disabled. In this state, crashes are
likely to occur in the app.

So, make sure we perform the first disable as soon as PackageManager
is ready. This ensures the app is not started until it has been
explicitly enabled.

Bug: 27821069
Change-Id: I771d7dde7880fd98b1df3d011be44164abf402f4
2016-04-07 14:03:32 -07:00
Jeff Davidson
b7e26fb1ad Move CarrierAppUtils into frameworks/base/telephony.
This is a no-op refactoring which will allow us to access
CarrierAppUtils from PackageManagerService.

Bug: 27821069
Change-Id: Id6ac33020395f7fc03b285ffa8c3d421a02270ec
2016-04-07 12:47:20 -07:00
Jack Yu
66a6be3a4c Excluded certain APNs (e.g. IMS) from mobile data usage.
Added not_metered capability to a mobile network if none
of its associated APN types are metered. Also used not_metered
capability to determine if a network should be accounted for
data usage or not instead of using network type, which is
always MOBILE after refactoring. Will add VT usage support
in next phase.

bug: 20888836
Change-Id: Id692cb856be9a47d0e918371112630128965b1bb
2016-04-07 10:07:31 -07:00
Junda Liu
e8235003c2 Merge "Add public API for sim authentication." into nyc-dev
am: a27cf02

* commit 'a27cf024e5a9fac9c254a533386bcb073817ecb2':
  Add public API for sim authentication.

Change-Id: Iaf27927945b40007110afb2b4e5cb9f231526a0c
2016-04-05 17:10:17 +00:00
Junda Liu
a27cf024e5 Merge "Add public API for sim authentication." into nyc-dev 2016-04-05 17:03:31 +00:00
Junda Liu
19fab78926 Add public API for sim authentication.
Bug: b/27360179
Change-Id: I95bc51797a808fd754202b671113ee0a60a8b99d
2016-04-01 10:37:00 -07:00
Tyler Gunn
bbebbd3501 Merge "Add carrier config option to determine if "wifi-only" is supported." into nyc-dev
am: 6c4af8c

* commit '6c4af8c9150293eb2eb73dae39451f7624f81c19':
  Add carrier config option to determine if "wifi-only" is supported.

Change-Id: I645a771e75d8a853ae2b7e192f88819cec5062cd
2016-04-01 15:56:02 +00:00
Tyler Gunn
5bbeea0883 Add carrier config option to determine if "wifi-only" is supported.
By default we set this to "true", however it is anticipated in the future
that some carrier may desire to not allow the wifi-only option, hence
this carrier config option.

Bug: 27858149
Change-Id: I55b09655a590a661780cd9ed89c1e1b0d87d54dc
2016-03-30 14:50:30 -07:00
Robert Greenwalt
beb482cf89 Add settings for SUW data control.
While the device is being provisioned we can default to
mobile-data-off and let the provisioning app turn mobile
data back on if the user wants it.  After provisioning
control is restored.

Settings in play:
Settings.Global.DEVICE_PROVISIONED (existing)
SystemProperty ro.com.android.mobiledata (existing)
Settings.Global.MOBILE_DATA (existing)

SystemProperty ro.com.android.prov_mobiledata (new)
Settings.Global.DEVICE_PROVISIONING_MOBILE_DATA_ENABLED (new)

If the new settings aren't used, the old behvior is used.

bug:26638209
Change-Id: I92617ed6e588a5c50cf39054412a15273a9e03ff
2016-03-28 15:40:56 -07:00
Tyler Gunn
2fcf461dd5 Merge "Add connection properties to Connections." into nyc-dev
am: ad716eb

* commit 'ad716ebb730d4aad4e3c2afdaea4a698a496a6bc':
  Add connection properties to Connections.
2016-03-25 03:51:27 +00:00
Tyler Gunn
720c664401 Add connection properties to Connections.
- Per suggestion of API council, moving properties of a Connection from
CAPABILITIES_* to PROPERTIES_*.

Bug: 27458894
Change-Id: Icce921b03cda514a991646ed39a26559c7e91230
2016-03-24 20:20:11 -07:00
Anju Mathapati
18723b96e4 Merge "IMS: Changes for MultiEndpoint" into nyc-dev
am: 0e3aff1

* commit '0e3aff1ab5c0cf0bb200910b10a81173d6d607a5':
  IMS: Changes for MultiEndpoint
2016-03-24 02:46:47 +00:00
Tyler Gunn
0e3aff1ab5 Merge "IMS: Changes for MultiEndpoint" into nyc-dev 2016-03-24 02:39:08 +00:00
Anju Mathapati
65314501f4 IMS: Changes for MultiEndpoint
- Change in api names

Change-Id: I9317c391d0017f5079ab488abe0bd1e949317bce
2016-03-23 19:20:21 -07:00
fionaxu
2dadfbd438 Merge " fix Memory Leak caused by PhoneStateListener" into nyc-dev
am: 3c11a5b

* commit '3c11a5b3f881c433a9b6885735dfd0d8d3f311a7':
  fix Memory Leak caused by PhoneStateListener
2016-03-23 22:40:06 +00:00
Chen Xu
3c11a5b3f8 Merge " fix Memory Leak caused by PhoneStateListener" into nyc-dev 2016-03-23 22:37:21 +00:00
fionaxu
f5d7c587e8 fix Memory Leak caused by PhoneStateListener
Bug: 22962661

Change-Id: Ibece746afc19dd6b71845a257b7bfb88a0f8e13f
2016-03-23 14:23:20 -07:00
Tyler Gunn
2e9438ad2b Merge "Correct naming issues with video calling carrier config items." into nyc-dev
am: dfc1ee0

* commit 'dfc1ee0162f6ee4b18c573f2d0d59001d0447f1a':
  Correct naming issues with video calling carrier config items.
2016-03-21 18:39:48 +00:00
Tyler Gunn
dfc1ee0162 Merge "Correct naming issues with video calling carrier config items." into nyc-dev 2016-03-21 18:37:09 +00:00
Ajay Nambi
d80d0a8703 Ril Error codes: Voice related messages am: 499a8da
am: 1981e60

* commit '1981e602ad97e3a21bc987dbeb0625e87a58ff8d':
  Ril Error codes: Voice related messages
2016-03-21 17:08:40 +00:00
Ajay Nambi
1981e602ad Ril Error codes: Voice related messages
am: 499a8da

* commit '499a8da1daa82f29eecd59f99721a1cdd52db716':
  Ril Error codes: Voice related messages
2016-03-21 17:06:21 +00:00
Ajay Nambi
499a8da1da Ril Error codes: Voice related messages
This change adds new error codes for messages
related to voice

Bug: 27038563
Change-Id: Id3a212c0b12e1feb26b0836fad3f9399d6dec19c
2016-03-21 16:59:58 +00:00
Pavel Zhamaitsiak
b4877263b1 Merge "ims:rcs: Add UCE interface files for RCS." into nyc-dev
am: eac4de2

* commit 'eac4de230d90497c96493d2b36909e8022a744f3':
  ims:rcs: Add UCE interface files for RCS.
2016-03-19 00:24:42 +00:00
Pavel Zhamaitsiak
2fca9ebc33 Merge "ims:rcs: Add UCE interface files for RCS. [DO NOT MERGE]" into mm-wireless-dev 2016-03-19 00:24:16 +00:00
Dheeraj Shetty
7ed3044ed1 ims:rcs: Add UCE interface files for RCS. [DO NOT MERGE]
Change-Id: I2ce9e60240740acfe70c4a239163fbdbedbd96e0
2016-03-19 00:22:59 +00:00
Pavel Zhamaitsiak
cfedd20d54 ims:rcs: Add UCE interface files for RCS.
Bug: 23222011
Change-Id: I2ce9e60240740acfe70c4a239163fbdbedbd96e0
2016-03-18 16:09:50 -07:00
Meng Wang
cca7e458f7 Merge "Add new key in CarrierConfigManager for ICCID display." into nyc-dev
am: 34b90a8

* commit '34b90a8ce3b3721a3bfcee15c780cdf45f712585':
  Add new key in CarrierConfigManager for ICCID display.
2016-03-17 17:35:17 +00:00
Meng Wang
6b2995ae14 Add new key in CarrierConfigManager for ICCID display.
Bug: 27574058
Change-Id: I74445c68f58e64a5baa87cd05fea9e91e59b0201
2016-03-16 15:09:17 -07:00
Tyler Gunn
f08361989d Correct naming issues with video calling carrier config items.
- Removed BOOL_ALLOW_VIDEO_PAUSE as it appears it was already added
as KEY_SUPPORT_PAUSE_IMS_VIDEO_CALLS_BOOL.
- Renamed BOOL_ALLOW_EMERGENCY_VIDEO_CALLS to KEY_ALLOW_EMERGENCY_VIDEO_CALLS_BOOL.

Bug: 27346047
Change-Id: I9f772e68ad9e78ce5a0419387c85a7f9630ecd5f
2016-03-15 20:33:13 -07:00
Tyler Gunn
3d09db6f7a DO NOT MERGE Add KEY_USE_RCS_PRESENCE_BOOL carrier config option.
- New carrier config option is used to determine if presence is used
to determine whether a contact is capable of video calling.
- Also, improve logging for PhoneAccount capabilities.

Bug: 20257833
Change-Id: Ifcc7df95677eb4399f08eb8849c4004892957e90
2016-03-14 16:06:11 -07:00
Ajay Nambi
21006d573c New error codes for SMS/other messages am: b3e1083ff0
am: 8fc9cc4419

* commit '8fc9cc441984e934d4ac1f12b80487320c5a76c2':
  New error codes for SMS/other messages
2016-03-14 21:30:20 +00:00
Ajay Nambi
8fc9cc4419 New error codes for SMS/other messages
am: b3e1083ff0

* commit 'b3e1083ff06155530c5ba91aa762c58e53d1fcc1':
  New error codes for SMS/other messages
2016-03-14 21:09:27 +00:00
Ajay Nambi
b3e1083ff0 New error codes for SMS/other messages
This change adds error codes for messages related
to SMS and set_mute, get_mute requests

Bug: 27038563
Change-Id: I9b989ae8b99da5e24f4f698f34f2c35b2a48ecbd
2016-03-14 11:41:31 -07:00
Anju Mathapati
8391d839bb Merge "IMS: Changes for MultiEndpoint" into nyc-dev
am: f8de70c7b7

* commit 'f8de70c7b7855cad84fd3565eb29bd9c49bb0bc3':
  IMS: Changes for MultiEndpoint
2016-03-14 17:56:38 +00:00
Tyler Gunn
f8de70c7b7 Merge "IMS: Changes for MultiEndpoint" into nyc-dev 2016-03-14 17:48:11 +00:00
Anju Mathapati
f604fc33c6 IMS: Changes for MultiEndpoint
- Interface changes for MultiEndpoint

- Extra for CallPull in -
  - TelephonyProperties
  - ImsProfile
- Error codes in ImsReasonInfo

Change-Id: I9a497cf04a412dc9d2f80b489e3455d289c3dfb7
2016-03-11 16:08:06 -08:00
Sanket Padawe
0bc008557f Fix build failure. am: 44729c613f
am: 69e24384a7

* commit '69e24384a7bf4051ca30fdd1e1338fdfd0416cf4':
  Fix build failure.
2016-03-11 18:01:32 +00:00
Sanket Padawe
69e24384a7 Fix build failure.
am: 44729c613f

* commit '44729c613fe65fd9b2f14b1844c1f02ba94ad498':
  Fix build failure.
2016-03-11 17:59:34 +00:00
Sanket Padawe
44729c613f Fix build failure.
+ Fix build failure caused by
https://partner-android-review.googlesource.com/#/c/538910/

Change-Id: I83b579f3db4c5a167b206318edcc627c6d2f4b0a
2016-03-11 09:50:56 -08:00