Commit Graph

3530 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
fionaxu
c1df936c16 Merge "Add CarrierConfig for metered roaming" into nyc-dev
am: 73efde0

* commit '73efde04efc5d8e36cf1eb2e0fa2bb52a4a326e1':
  Add CarrierConfig for metered roaming

Change-Id: Ic3955a4a208dcf206d607cda25eee03c37e96a1e
2016-04-26 22:50:14 +00:00
Chen Xu
73efde04ef Merge "Add CarrierConfig for metered roaming" into nyc-dev 2016-04-26 22:42:18 +00:00
Tobias Thierer
334a936e15 Merge "Avoid instantiations of Boolean that are immediately unboxed." into nyc-dev-plus-aosp
am: cc0eaf4

* commit 'cc0eaf4124011d8a370f3c354e241887a633e8f1':
  Avoid instantiations of Boolean that are immediately unboxed.

Change-Id: Ia4ea8bbd2a4fd5cb3094f3682034542b8f7d8e80
2016-04-25 09:59:09 +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
c63cf69707 Merge "Rename _BOOLEAN visual voicemail config keys to _BOOL" into nyc-dev am: 8431a48
am: e85b334

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

Change-Id: Ie313f719d49c1104c10ce4cce1e3356d6f7d7c0f
2016-04-22 23:39:34 +00: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
da83b755a3 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: I5c176db61c64048973eae5377164eb658e8ede88
2016-04-22 23:33:56 +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
825d4b8143 Merge "Add comments to apptype and authtype constants." into nyc-dev am: cc69bed
am: e96849f

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

Change-Id: I329bf0e2a56ada4f03e0f8ad4a5e84dfeb32c21e
2016-04-22 19:23:48 +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
060e8f9dc5 Merge "Add comments to apptype and authtype constants." into nyc-dev
am: cc69bed

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

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

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

Change-Id: Ieaf1840c8025913f4b9691884356d8b7256194ed
2016-04-21 02:18:11 +00: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
795939499d Merge "Additional checks for ModemActivityInfo.isValid()" into nyc-dev
am: f6496db8ce

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

Change-Id: Id4fb225d71e33bbfdf57dd13278fc71b4cd40370
2016-04-21 02:16:00 +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
e1b56701fd Merge changes from topic \'merge_docs_nyc-dev\' into nyc-dev am: 59c9a93
am: 254f1b8

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

Change-Id: I32a3081af9ca5533785c90b7239ffd5b5e69d5bf
2016-04-20 21:15:11 +00: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
254f1b8a43 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: I3ce213d0e7412125861d39f1726be4b5a751c828
2016-04-20 18:43:55 +00: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
Pavel Zhamaitsiak
e682152e7b Merge "Add addRegistrationListener function to IImsService.aidl" into nyc-mr1-dev
am: 644a007

* commit '644a00734f679cb570164e0974c0a98f2a642a59':
  Add addRegistrationListener function to IImsService.aidl

Change-Id: I0beec52050efa8ca9412600657286128ec617121
2016-04-20 05:20:43 +00:00
Vineeta Srivastava
644a00734f Merge "Add addRegistrationListener function to IImsService.aidl" into nyc-mr1-dev 2016-04-20 02:43:15 +00:00
Chen Xu
23493de983 Merge "Cold Sim issue fix" into nyc-dev am: 771fbfef27
am: 6ee7417cd7

* commit '6ee7417cd7c14b17548f34931e5c3393733c6698':
  Cold Sim issue fix

Change-Id: Idc3784df620745ef7563b6e64608f0dcc7e96510
2016-04-20 00:16:48 +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
Pavel Zhamaitsiak
6e6950ee66 Add addRegistrationListener function to IImsService.aidl
This allows to register additional IMS connection listeners.
IImsService.open() is no longer supposed to be used for that purpose.

Bug: 28150730
Change-Id: I949e0c912de66e82864934a1ad9ec2ec36f57909
2016-04-19 23:49:55 +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
5b7c57d53b Merge "BatteryStats: Introduce Async external stats requests" into nyc-dev am: 0d47f4b
am: 811c48d

* commit '811c48d7f5356719c3110f61a492b5af085a3828':
  BatteryStats: Introduce Async external stats requests

Change-Id: I8a539d26aaea10e64ad35060c17ea6326772e211
2016-04-18 23:40:58 +00: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
Shishir Agrawal
54cf95f618 Merge "Adding slotId to certain Telephony broadcasts." into nyc-dev
am: 3f6e211

* commit '3f6e211d7306bb7a4d5abc01a966e06294a48988':
  Adding slotId to certain Telephony broadcasts.

Change-Id: If4b3ca0500b43137bd33d22449fb362bdf30c1d1
2016-04-18 16:33:08 +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
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
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
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
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