Commit Graph

3484 Commits

Author SHA1 Message Date
Narayan Kamath
42c2de56ab Remove unnecessary allocation+unboxing of objects. am: a09b4d2
am: 4c89ae0

* commit '4c89ae0ee4f3d73d84843bf05cdc328b5e821da3':
  Remove unnecessary allocation+unboxing of objects.

Change-Id: I46f5ec0b9b8bc14073bcf7dc643bc909072d53ff
2016-04-18 10:36:37 +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
Tyler Gunn
6431276d5f Merge "Adding some new multi-endpoint stuff." into nyc-dev
am: a6f12cf

* commit 'a6f12cf3d059b31db6f9119317956ec44b09a76d':
  Adding some new multi-endpoint stuff.

Change-Id: Ia53b795e65a86b58d081fc0222b580fcdd6da9d8
2016-04-15 21:11:36 +00:00
Tyler Gunn
a6f12cf3d0 Merge "Adding some new multi-endpoint stuff." into nyc-dev 2016-04-15 21:01:12 +00:00
Jack Yu
afdb3c3163 Merge "Removed the unused RIL constant" into nyc-dev
am: 4f9b759

* commit '4f9b759d8f801a590c38b50dd0bc530ee169957f':
  Removed the unused RIL constant

Change-Id: I96d66109f3f3f422dbf7c163a2874fd1bfd60e4f
2016-04-14 23:40:47 +00:00
Jack Yu
4f9b759d8f Merge "Removed the unused RIL constant" into nyc-dev 2016-04-14 23:32:44 +00:00
Pavel Zhamaitsiak
f0953fca17 Merge "Consolidate WiFi Calling string resources" into nyc-dev
am: 070b73a

* commit '070b73a46d7344b8a1c771ab537c30c08d078051':
  Consolidate WiFi Calling string resources

Change-Id: Iae5ab0c3f42b18e751bac38d8abc39473ec63927
2016-04-14 17:22:17 +00:00
Pavel Zhamaitsiak
070b73a46d Merge "Consolidate WiFi Calling string resources" into nyc-dev 2016-04-14 17:16:41 +00:00
Pavel Zhamaitsiak
5b2e5316d8 Merge "Delete ITelephonyDebug and ITelephonyDebugSubscriber" into nyc-dev
am: 0a97f22

* commit '0a97f22e068aeffd7384f64d26ab922b6d15670f':
  Delete ITelephonyDebug and ITelephonyDebugSubscriber

Change-Id: I02d01abb811fc309024fb04fb5f56207a441a478
2016-04-14 01:01:29 +00:00
TreeHugger Robot
0a97f22e06 Merge "Delete ITelephonyDebug and ITelephonyDebugSubscriber" into nyc-dev 2016-04-14 00:52:36 +00:00
Junda Liu
d4844d5b6b Merge "Remove deprecated API for sim authentication." into nyc-dev
am: d274486

* commit 'd2744865949afd9148dc2accfeeaea8d7f61d731':
  Remove deprecated API for sim authentication.

Change-Id: I1690092452912bcf603f5865a990edb3f2478506
2016-04-14 00:08:06 +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
Jack Yu
3ee538c10d Removed the unused RIL constant
We should use Integer.MAX_VALUE instead defining our own MAX_INT

bug: 27787361
Change-Id: I9630d66674530f9b7a8843cc454d0382b738463c
2016-04-13 14:19:34 -07:00
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
Tyler Gunn
9eb78515dc Adding some new multi-endpoint stuff.
Adding getVideoStateFromCallType method to ImsCallProfile, which basically
just breaks out some of the existing logic in getVideoStateFromImsCallProfile.
This is used to translate the CALL_TYPE_* from an external call to a
video state (used when pulling the call).

Added a new ImsReasonInfo code for when multi-endpoint fails to configure
because the modem does not support it.

Bug: 27458894
Change-Id: I226e79005dccf3e8cae30e4d448543adbe59f922
2016-04-12 16:13:44 -07:00
Pavel Zhamaitsiak
7b7c4fc2fe Consolidate WiFi Calling string resources
- move wfcOperatorErrorCodes to CarrierConfig
- corresponding error alert and notification messages are moved to the
  main string.xml and are accessed by index defined in wfcOperatorErrorCodes
- make a list of supported SPN formats and use CarrierConfig to define
  index of appropriate format string

Bug: 27170754
Change-Id: I698908157c1022f47a43ef70f03a571f1d0c75da
2016-04-12 14:24:07 -07: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
Pavel Zhamaitsiak
0fb0731358 Delete ITelephonyDebug and ITelephonyDebugSubscriber
Bug: 28026463
Change-Id: Iee9010dd7352bafcffb5718293f8d71f2fd98ea9
2016-04-05 16:18:03 -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