Commit Graph

1227 Commits

Author SHA1 Message Date
Chen Xu
aaa41a3a65 Merge "Add CarrierConfig for metered roaming" into nyc-dev am: 73efde0
am: c1df936

* commit 'c1df936c1602f91a623279d602f454d636463fde':
  Add CarrierConfig for metered roaming

Change-Id: Ib1e8a78f7a5aabdaeeb04afafa9cc6c0725d2880
2016-04-26 23:16:18 +00:00
Chen Xu
73efde04ef Merge "Add CarrierConfig for metered roaming" into nyc-dev 2016-04-26 22:42:18 +00:00
Tobias Thierer
b0800dce4a Avoid instantiations of Boolean that are immediately unboxed.
Replaced Boolean.valueOf() -> parseBoolean() across frameworks/base
(not including Am.java, which I'm leaving for a separate change).

Also fixed a couple of other valueOf()s in SyncStorageEngine.

Bug: 28289401
(cherry-picked from commit ca01820735)
Change-Id: I2c6fb39a465885e7e625ed8894b1b9f8a30da5bc
2016-04-25 10:47:02 +01:00
Ta-wei Yen
e85b334c41 Merge "Rename _BOOLEAN visual voicemail config keys to _BOOL" into nyc-dev
am: 8431a48

* commit '8431a48f779939a9c49538d054539321f9421e6c':
  Rename _BOOLEAN visual voicemail config keys to _BOOL

Change-Id: I20ec57dbcaad08e02a9bcea40f52f077eff0e730
2016-04-22 23:33:59 +00: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
e96849f564 Merge "Add comments to apptype and authtype constants." into nyc-dev
am: cc69bed

* commit 'cc69bed61fadd99627751b6e04e99f2c42ef3025':
  Add comments to apptype and authtype constants.

Change-Id: Ie7f2d97b7ac79d31bac8b77d0a8056f4c13cc5b7
2016-04-22 19:18:50 +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
2a403859b6 Merge "Additional checks for ModemActivityInfo.isValid()" into nyc-dev
am: f6496db8ce

* commit 'f6496db8cefe68b2d02fde22a68b84f7b5c86686':
  Additional checks for ModemActivityInfo.isValid()

Change-Id: If8f3bb4e47ab526961dbb1209e69aa8dd09f5b40
2016-04-21 02:16:03 +00: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
Trevor Johns
c0d2c43a22 Merge changes from topic \'merge_docs_nyc-dev\' into nyc-dev
am: 59c9a93

* commit '59c9a93fc268e226495d4ee8cf7c507c2ea2c433':
  Remove links to createAndInitializeUser() and createUser()
  Resolve merge conflicts of a5060ee to nyc-dev

Change-Id: Iddc9419069d8f5d555baf0c1ef4b2f2ebf75c370
2016-04-20 21:12:38 +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
fionaxu
8a05d513e6 Merge "Cold Sim issue fix" into nyc-dev
am: 771fbfef27

* commit '771fbfef27bcc98c57818b7c7b63a374e555b6db':
  Cold Sim issue fix

Change-Id: I1af095fa0586db89f59a8fbb16be8a3066a5f2fc
2016-04-20 00:14:35 +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 e740c84dc3 and
replays it as a standard (NOT -s ours) merge.

Change-Id: If5a47be26f73d6a0735c425cd66310a3e2a89086
2016-04-19 02:03:59 -07:00
Adam Lesinski
63696c00e2 Merge "BatteryStats: Introduce Async external stats requests" into nyc-dev
am: 0d47f4b

* commit '0d47f4b6463077074abd6bed489a5f9243615c64':
  BatteryStats: Introduce Async external stats requests

Change-Id: I7319535a0210e38a6bc3731a9f0ec42a4485924f
2016-04-18 23:38:11 +00:00
Adam Lesinski
0d47f4b646 Merge "BatteryStats: Introduce Async external stats requests" into nyc-dev 2016-04-18 23:27:10 +00:00
Sunil Dutt
7299ce924f Merge "Wifi: Introduce a configuration parameter to disable WiFi in ECBM" into nyc-dev
am: 951fe29

* commit '951fe2925ff61b7d11149c3d897763d278ba1006':
  Wifi: Introduce a configuration parameter to disable WiFi in ECBM

Change-Id: I7ebe1f138d53cf683afab573588bf67597fe10bd
2016-04-18 16:33:05 +00:00
Sandeep Gutta
b6eb7fabbd Merge "Handle mnc 00 while retrieving the Resources based on subid" into nyc-dev
am: 37c26e4

* commit '37c26e4d13235b9fd297f1d52e9d874b7e488fbf':
  Handle mnc 00 while retrieving the Resources based on subid

Change-Id: I5d7cbd11c5739c96b3d316ebf51e9424fbe703bf
2016-04-18 16:33:02 +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
3a00b69702 Remove unnecessary allocation+unboxing of objects.
am: a09b4d2

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

Change-Id: Idfffa8fad0f6bcffa954752910524bdc879d65b7
2016-04-18 10:31: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
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
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
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
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
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
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
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
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
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