2378 Commits

Author SHA1 Message Date
Santos Cordon
cb9086c5bf Fix build break.
Change-Id: If80984f9a62809829b3767193eff981ccb1185c7
2014-05-19 09:25:13 -07:00
Santos Cordon
94a873de0f Merge "Remove methods added in TelephonyManager." 2014-05-19 15:18:51 +00:00
Santos Cordon
14816d669b Remove methods added in TelephonyManager.
Change-Id: I771502ab76dfc24eb19b9ff58b029bea45d6832c
2014-05-16 17:58:09 -07:00
Evan Charlton
b8894ab1ae Revert "Revert "Modify TelephonyManager to expose sendEnvelopeWithStatus instead of sendEnvelope.""
This reverts commit f743b163fc764b7ebf701a9e65b13d308530d750.

Change-Id: Ie274a024d2cdb6f11082e6bf391732a304863074
2014-05-16 13:31:26 -07:00
Evan Charlton
210889e91c Revert "Revert "Expose sendEnvelope.""
This reverts commit 23745256000bffaad4038ad9fe6e2b0941074a53.
2014-05-16 12:50:13 -07:00
Evan Charlton
4a644e3903 Merge "Remove obsolete ThirdPartyCall APIs" 2014-05-14 22:08:21 +00:00
Evan Charlton
fcca6cd019 Merge "Revert "Expose sendEnvelope."" 2014-05-14 22:08:10 +00:00
Evan Charlton
605e4942d6 Merge "Revert "Modify TelephonyManager to expose sendEnvelopeWithStatus instead of sendEnvelope."" 2014-05-14 22:07:47 +00:00
Evan Charlton
0082e3302f Remove obsolete ThirdPartyCall APIs
These should have been reverted long ago. Additional cleanup will need
to happen, but this is a good first pass.

Change-Id: I6d3c2919299c0a0b9714ffecd30da68e5c880b6a
2014-05-14 15:05:47 -07:00
Andrew Lee
4268b243de Merge "Handle normalization of a "null" phone number." 2014-05-14 21:44:39 +00:00
Evan Charlton
8f402c36cb Revert "Expose sendEnvelope."
This reverts commit 6eac2ee0fc8a652c4cb1e7ca6602a080d4f82dbd.

Change-Id: Ie04a873bb1d4935208e687917e86cbe80312a6d1
2014-05-14 14:02:21 -07:00
Evan Charlton
c0d138ab86 Revert "Modify TelephonyManager to expose sendEnvelopeWithStatus instead of sendEnvelope."
This reverts commit 37384dedab38239433a41641fe87fc3e51bb6976.
2014-05-14 14:01:47 -07:00
Ed Heyl
2cf184233b merge master nova by hand, skipped translations
Change-Id: I4bea0bb9e375361f21d995bf4698d5eb6300ecfb
2014-05-14 13:24:53 -07:00
Andrew Lee
b31c310fcf Handle normalization of a "null" phone number.
Bug: 14900155
Change-Id: I1c4c5c6dec4c4c470b436102c72a7476d3d5237c
2014-05-14 13:00:28 -07:00
Robert Greenwalt
f9cb86aebe Replace LinkCapabilities with NetworkCapabilities
Also remove unused LinkSocket and LinkSocketNotifier.
bug:13885501

Change-Id: Id426e31b201fa4f29109b5fea485d8efb34519d3
2014-05-12 16:52:56 -07:00
Wink Saville
784f90facf am 192384bb: am 43799457: am 74ec5808: am 7e411f74: Merge "Add support for NETWORK_TYPE_GSM"
* commit '192384bb2708c49ca6c91432b8c848f43557429a':
  Add support for NETWORK_TYPE_GSM
2014-05-01 18:07:58 +00:00
Wink Saville
51d427ca9b am 43799457: am 74ec5808: am 7e411f74: Merge "Add support for NETWORK_TYPE_GSM"
* commit '437994578272f9770748b152c53ec655059d19ec':
  Add support for NETWORK_TYPE_GSM
2014-05-01 18:03:57 +00:00
Wink Saville
74ec580873 am 7e411f74: Merge "Add support for NETWORK_TYPE_GSM"
* commit '7e411f74efe6dd383e59634760cccd96da1c209b':
  Add support for NETWORK_TYPE_GSM
2014-05-01 17:57:51 +00:00
Sandeep Kunta
10731a6140 Add support for NETWORK_TYPE_GSM
Add support for NETWORK_TYPE_GSM in TelephonyManager and
corresponding mapping in ServicState.java so that when
application queries for getVoiceNetworkType() and currently
camped rat is GSM, they get network mode as GSM instead
of network mode unknown.

Change-Id: Ibe4672b04a5044710d63499c4cf2b6ebe91444bf
2014-05-01 17:53:42 +00:00
Bill Yi
293513a59d Merge commit '0b62467b142b61ee1e449ba958ba37dfd961ef56' into HEAD 2014-04-29 16:07:29 -07:00
Wink Saville
994a9a39b5 am e9c9547e: am c79963c3: am 1c1827a6: am 3f4867f4: Merge "Telephony: Add functionality to handle ICC IO error"
* commit 'e9c9547e899a7095f3fb420df7d4d809ab13ea57':
  Telephony: Add functionality to handle ICC IO error
2014-04-26 00:35:49 +00:00
Wink Saville
ae166fe9e0 am c79963c3: am 1c1827a6: am 3f4867f4: Merge "Telephony: Add functionality to handle ICC IO error"
* commit 'c79963c3cb6d0127e2fc9ce5bf000fa05811504d':
  Telephony: Add functionality to handle ICC IO error
2014-04-26 00:28:56 +00:00
Wink Saville
c79963c3cb am 1c1827a6: am 3f4867f4: Merge "Telephony: Add functionality to handle ICC IO error"
* commit '1c1827a6402c3a1f38ba077289a9022f6e6d3f73':
  Telephony: Add functionality to handle ICC IO error
2014-04-26 00:25:44 +00:00
Wink Saville
3f4867f49d Merge "Telephony: Add functionality to handle ICC IO error" 2014-04-25 23:58:11 +00:00
Evan Charlton
5e78e76ad7 resolved conflicts for merge of 806047ca to master-nova
Change-Id: I6754198919b952bd733733572f64a316cb41b101
2014-04-24 13:56:19 -07:00
Dianne Hackborn
2ffa11e4b7 Start collecting mobile radio activity from the radio.
Hook in to the new radio API to find out when the radio
is active and use that to track its state in batter stats.
We also still have the data being tracked from the kernel's
emulation, and continue to use that if we don't get data from
the radio.

Currently this monitoring is turned off until some issues
in the radio can be fixed that are providing bad data.

Also add a new API to get estimated drain and charge times.

Change-Id: Ifc4900fabb8f848f9cda361dce698664ea75f175
2014-04-24 11:21:30 -07:00
Evan Charlton
a3db733885 resolved conflicts for merge of 8d966e42 to master-nova
Change-Id: Ibcc7d1eb4f0349e90b8e97d5235a08efb8226ef6
2014-04-16 13:14:39 -07:00
Wink Saville
070e061a28 Add LISTEN_DATA_CONNECTIPON_REAL_TIME_INFO as listen event
Also added DataConnectionRealTimeInfo structure which passed as a
parameter to onDataConnectionRealTimeInfoChanged.

Change-Id: Iadcbf9765af57c125bcdf74e3fc652ed6c8f7d42
2014-04-15 22:04:10 -07:00
Brian Williammee
9710faff3b am 7217f380: Correct some comments (LTE->CDMA)
* commit '7217f3805819b6feca7ec1cc378a9ca56cf2d275':
  Correct some comments (LTE->CDMA)
2014-04-11 14:27:14 +00:00
Brian Williammee
7217f38058 Correct some comments (LTE->CDMA)
Change references to LTE in CellSignalStrengthCdma to CDMA.

Change-Id: I2c003746dcef84949af69e2fbd4e5db4906e1125
2014-04-11 14:23:38 +00:00
Santos Cordon
20e3f02c2d Add disconnect cause to setDisconnected.
Change-Id: I4ba9b8f47a942b82b7a3d4bed43c0ca945957592
2014-03-31 14:58:11 -07:00
Anders Kristensen
6d21b125b9 am 83ee4429: am 7bce23f7: am aee03bb1: am 49c06150: Merge "Remove duplicate call disconnect codes."
* commit '83ee4429f13896c82f3f29c8164888f1f6fe8309':
  Remove duplicate call disconnect codes.
2014-03-28 21:10:22 +00:00
Anders Kristensen
83ee4429f1 am 7bce23f7: am aee03bb1: am 49c06150: Merge "Remove duplicate call disconnect codes."
* commit '7bce23f733cfaa1028e553852ff7762d7b32a893':
  Remove duplicate call disconnect codes.
2014-03-28 17:40:52 +00:00
Anders Kristensen
7bce23f733 am aee03bb1: am 49c06150: Merge "Remove duplicate call disconnect codes."
* commit 'aee03bb1a1077427c918ad9fea5fdd1ab204f60e':
  Remove duplicate call disconnect codes.
2014-03-28 17:31:33 +00:00
Gabriel Peal
9938854e71 am db0dca82: resolved conflicts for merge of c1edfc2c to master
* commit 'db0dca826d992af1adfa53e10c31f08d3197bb0b':
  resolved conflicts for merge of c1edfc2c to master
2014-03-25 13:46:13 -07:00
Gabriel Peal
db0dca826d resolved conflicts for merge of c1edfc2c to master
attempt 2

Change-Id: Ic9e6e9e02c4781617deeea3ddcb4a0b2b659e4fc
2014-03-25 13:39:55 -07:00
Sailesh Nepal
fb48c1c722 resolved conflicts for merge of 5e44cadf to master-nova
Change-Id: Ieacfbba60109a60b268c116a40e598c0745e8a3b
2014-03-25 13:16:40 -07:00
Sailesh Nepal
00ffde305d resolved conflicts for merge of 2d72d000 to master-nova
Change-Id: Icfb617ffab2da2f8805e4628e75e006c620b479d
2014-03-25 13:02:59 -07:00
Gabriel Peal
8b5f2b080d resolved conflicts for merge of c1edfc2c to master
Change-Id: Ica42d8ac1552040f7ea2864ff529f5fc1470001b
2014-03-25 12:21:43 -07:00
Gabriel Peal
f1e1e77143 resolved conflicts for merge of 74fb97de to master
Change-Id: If28dc21a2ea7e634da130f3c59c17cd63dd5336a
2014-03-25 11:08:19 -07:00
Gabriel Peal
4668f1ed0d am 8ee4491d: am e05077d7: am 83da75d9: Added a private apis jar that includes explicitly supported APIs that are not useful for 3rd party developers.
* commit '8ee4491dc80943429cd79d0c7b87c28056067a58':
  Added a private apis jar that includes explicitly supported APIs that are not useful for 3rd party developers.
2014-03-25 03:54:11 +00:00
Gabriel Peal
8ee4491dc8 am e05077d7: am 83da75d9: Added a private apis jar that includes explicitly supported APIs that are not useful for 3rd party developers.
* commit 'e05077d78c9abde054a754db53e71c647b9a705c':
  Added a private apis jar that includes explicitly supported APIs that are not useful for 3rd party developers.
2014-03-25 03:46:17 +00:00
Gabriel Peal
16578caea8 am e05077d7: am 83da75d9: Added a private apis jar that includes explicitly supported APIs that are not useful for 3rd party developers.
* commit 'e05077d78c9abde054a754db53e71c647b9a705c':
  Added a private apis jar that includes explicitly supported APIs that are not useful for 3rd party developers.
2014-03-22 23:41:43 +00:00
Gabriel Peal
83da75d938 Added a private apis jar that includes explicitly supported APIs that are not useful for 3rd party developers.
The first set of these APIs is for telephony:

Added some APIs to ITelephony and created a first party framework for them

toggleHold()
merge()
mute(boolean mute)
playDtmfTone(char digit, boolean timedShortCode)
stopDtmfTone()
swap()
addListener(ITelephonyListener listener)
removeListener(ITelephonyListener listener)

Bug: 13302451
Change-Id: Iefec5688c26a1b4fe77f5643eba6e1690a057ee6
2014-03-22 13:33:43 -07:00
Shishir Agrawal
37384dedab Modify TelephonyManager to expose sendEnvelopeWithStatus instead of sendEnvelope.
The RIL sendEnvelope command does not return the response from the SIM while
the sendEnvelopeWithStatus does. Since the response is required for certain
envelope commands, its better to expose sendEnvelopeWithStatus.

Change-Id: I209bfc59e396bb6f91345d6f99c51cfa35f2d650
2014-03-14 09:38:03 -07:00
Rakesh Pallerla
f099a5f389 Telephony: Add functionality to handle ICC IO error
At present in Android all ICC Card states other than
ICC PRESENT are treated as ICC ABSENT.Adding functionality
to handle ICC IO error card state.

Change-Id: I229bd80cb5e487f4345bef9fb7fee60850f085d9
Bug: 10643652
2014-03-12 12:23:41 +05:30
Evan Charlton
9bbb37116d resolved conflicts for merge 322f7d6e to master-nova
Change-Id: I31de6084253ce21f50224582f82b7f7e630ef34e
2014-03-06 10:08:06 -08:00
Anders Kristensen
b584e690a6 Remove duplicate call disconnect codes.
The Android code base defines call disconnect codes in three places:
 - android.telephony.DisconnectCause
 - android.internal.telephony.Connection.DisconnectCause
 - com.android.services.telephony.common.Call.DisconnectCause

This CL consolidates the code to use the integer codes from
android.telephony.DisconnectCause everywhere.

Change-Id: I84a3fd5182a51d07fc7d81076e4b2c15ff26c61c
2014-03-05 15:45:26 -08:00
Jake Hamby
4a2fa35a6a Add get/setPreferredNetworkType() for OMA DM client.
Add get/setPreferredNetworkType() commands for OMA DM client.

Bug: 8847590
Change-Id: Ia898d712b90ec583d61efe7385a5a1844d8beff1
2014-03-03 13:27:20 -08:00
Jake Hamby
4a4db51194 resolved conflicts for merge of 786e71ab to master-nova
Change-Id: Ibe5e0a68f59d95c4a8c721d9e21626714d33ccd0
2014-02-24 12:50:48 -08:00