3459 Commits

Author SHA1 Message Date
Nathan Harold
f6496db8ce Merge "Additional checks for ModemActivityInfo.isValid()" into nyc-dev 2016-04-21 02:09:28 +00: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
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 e740c84dc32180214a7fd157105d6c18d30408ee 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
Shishir Agrawal
3f6e211d73 Merge "Adding slotId to certain Telephony broadcasts." into nyc-dev 2016-04-18 16:28:16 +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
Tyler Gunn
a6f12cf3d0 Merge "Adding some new multi-endpoint stuff." into nyc-dev 2016-04-15 21:01:12 +00: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
Shishir Agrawal
f7e59c1f61 Adding slotId to certain Telephony broadcasts.
These particular boradcasts need to expose phoneId since they are valid even
when there is no SIM.

ACTION_SERVICE_STATE_CHANGED
  - Added phoneId to broadcast.
  - Removed TelephonyRegistry non subId call.
ACTION_SIGNAL_STRENGTH_CHANGED
  - Added phoneId to broadcast.
  - Removed TelephonyRegistry non subId call.
ACTION_PHONE_STATE_CHANGED
  - Added phoneId to broadcast.
  - The non-subId version is called by Telecomm to communicate overall state.
    Telephony sends its own version, so only the Telephony call needs to add
    phoneId.

Bug: 27378995

Change-Id: I554f7ee18b9ae19919f4724328dcff3ef9cbd092
2016-04-15 13:31:12 -07:00
Jack Yu
4f9b759d8f Merge "Removed the unused RIL constant" into nyc-dev 2016-04-14 23:32:44 +00:00
Pavel Zhamaitsiak
070b73a46d Merge "Consolidate WiFi Calling string resources" into nyc-dev 2016-04-14 17:16:41 +00:00
TreeHugger Robot
0a97f22e06 Merge "Delete ITelephonyDebug and ITelephonyDebugSubscriber" into nyc-dev 2016-04-14 00:52:36 +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
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
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
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
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
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
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
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
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
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
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
dfc1ee0162 Merge "Correct naming issues with video calling carrier config items." into nyc-dev 2016-03-21 18:37:09 +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
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
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