6 years agoam 9b5a5a0f: am eb69ddd4: am c2e35f33: (-s ours) am 932e8e5d: (-s ours) Reconcile...
Jean-Baptiste Queru [Mon, 11 Mar 2013 19:34:30 +0000]
am 9b5a5a0f: am eb69ddd4: am c2e35f33: (-s ours) am 932e8e5d: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '9b5a5a0f9dac0b5d7d540e1669bbccc74c1a37d2':

6 years agoam eb69ddd4: am c2e35f33: (-s ours) am 932e8e5d: (-s ours) Reconcile with jb-mr1...
Jean-Baptiste Queru [Mon, 11 Mar 2013 19:32:01 +0000]
am eb69ddd4: am c2e35f33: (-s ours) am 932e8e5d: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit 'eb69ddd4db1f1a421f1d27e1d42d557f0897f08e':

6 years agoam c2e35f33: (-s ours) am 932e8e5d: (-s ours) Reconcile with jb-mr1-release - do...
Jean-Baptiste Queru [Mon, 11 Mar 2013 19:28:33 +0000]
am c2e35f33: (-s ours) am 932e8e5d: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit 'c2e35f33ae6a31d4420672ad4dad46ca297c0db7':

6 years agoam 932e8e5d: (-s ours) Reconcile with jb-mr1-release - do not merge
Jean-Baptiste Queru [Mon, 11 Mar 2013 19:23:00 +0000]
am 932e8e5d: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '932e8e5dacd4e154d5c7b94f396a4d32de931551':

6 years agoReconcile with jb-mr1-release - do not merge
Jean-Baptiste Queru [Mon, 11 Mar 2013 19:19:44 +0000]
Reconcile with jb-mr1-release - do not merge

6 years agoMerge "Telephony: Set TP-RD to 1 in case of retry"
Wink Saville [Mon, 11 Mar 2013 15:34:38 +0000]
Merge "Telephony: Set TP-RD to 1 in case of retry"

6 years agoTelephony: Set TP-RD to 1 in case of retry
Rika Brooks [Thu, 7 Jun 2012 00:16:56 +0000]
Telephony: Set TP-RD to 1 in case of retry

per TS 23.040 Section 9.2.3.6: In the case where no response or an
RP-ERROR with an appropriate cause value (see 3GPP TS 24.011 [13]) is
received in response to an SMS-SUBMIT, then the MS shall automatically
repeat the SMS-SUBMIT but must use the same TP-MR value
and set the TP-RD bit to 1 (see 9.2.3.25)

Bug:  8323645
Change-Id: I1c7ebc67f80a6eeba456ab0dc5f6331a038d7ab2

6 years agoMerge "Send user confirmation instead of Terminal Response"
Wink Saville [Wed, 6 Mar 2013 16:18:27 +0000]
Merge "Send user confirmation instead of Terminal Response"

6 years agoMerge "Telephony: Fix for first pause DTMF digit"
Wink Saville [Wed, 6 Mar 2013 16:16:40 +0000]
Merge "Telephony: Fix for first pause DTMF digit"

6 years agoTelephony: Fix for first pause DTMF digit
Shruthi Krishnan [Mon, 20 Dec 2010 23:04:21 +0000]
Telephony: Fix for first pause DTMF digit

As per 3GPP requirement first pause sequence also should maintain 3 sec
delay. Added fix to wait for 3 sec time before sending DTMF digits to
RIL.

Change-Id: I6041614b544cc9c24521bee9ad505439b810ff86

6 years agoSend user confirmation instead of Terminal Response
Abhishek Adappa [Tue, 15 Jan 2013 19:36:49 +0000]
Send user confirmation instead of Terminal Response

On certain proactive commands like  Setup Call/Open Channel,
a confirmation dialog is displayed to the user to confirm or reject the
call. If the user hits the back key to dismiss the dialog or the user
 hits 'No', consider that as the user rejecting the call, instead
of sending a Terminal Response.

Bug: 8302972
Change-Id: I23d57f726018a6805ef455f6069dbab8e6dd14f0

6 years agoMerge "Telephony: Return 'null' when SubscriberId and Line1Number are unavailable"
Wink Saville [Thu, 28 Feb 2013 15:18:20 +0000]
Merge "Telephony: Return 'null' when SubscriberId and Line1Number are unavailable"

6 years agoTelephony: Return 'null' when SubscriberId and Line1Number are unavailable
Abhishek Adappa [Tue, 24 Jul 2012 23:14:47 +0000]
Telephony: Return 'null' when SubscriberId and Line1Number are unavailable

Return 'null' instead of "" (empty string) when Subscriber Id and
Line1Number are unavailable. This confirms to the definition of the
public API.

Bug: 8284793
Change-Id: Ie6395623cf413d51f6e10316aded71e2eaf5592c

6 years agoMerge "Fix build."
Elliott Hughes [Wed, 27 Feb 2013 02:11:39 +0000]
Merge "Fix build."

6 years agoFix build.
Elliott Hughes [Wed, 27 Feb 2013 02:10:51 +0000]
Fix build.

TimeZones was renamed to the more accurate TimeZoneNames.

Change-Id: Ia44bc852cd7f65466a97e815e3289a61ee22cb0f

6 years agoMerge "Update PS state when radio off or unavailable"
Wink Saville [Tue, 26 Feb 2013 18:00:13 +0000]
Merge "Update PS state when radio off or unavailable"

6 years agoUpdate PS state when radio off or unavailable
Ye Jingjing [Thu, 6 Sep 2012 08:12:08 +0000]
Update PS state when radio off or unavailable

When radio off or unavailable, CS state has been reset,
but PS state has not updated, in fact both CS and PS
state should be out of service. So SMS will try to be
sent out when sending sms, the result is "could not send"
rather than sms being queued for sending.
This fix will reset PS state to power off or out of
service when radio off or unavailable accordingly.

Bug: 8265430
Change-Id: I46e962c30021ff1273dcc559579bdedc7f432a64

6 years agoMerge "Telephony: Update Permanent Fail and Event Loggable Types"
Wink Saville [Wed, 20 Feb 2013 22:17:21 +0000]
Merge "Telephony: Update Permanent Fail and Event Loggable Types"

6 years agoTelephony: Update Permanent Fail and Event Loggable Types
Chris Lei [Wed, 5 Sep 2012 01:33:36 +0000]
Telephony: Update Permanent Fail and Event Loggable Types

- Updating isPermanentFail() and isEventLoggable() to better
  comply with "no retry" requirements in ril.h

Change-Id: I377eba7ec0203e41ae7689192a41f6b260a8775a

6 years agoMerge "Fix for storing CPHS MWI messages with store type"
Jake Hamby [Tue, 12 Feb 2013 22:45:26 +0000]
Merge "Fix for storing CPHS MWI messages with store type"

6 years agoFix for storing CPHS MWI messages with store type
Björn Ekberg [Wed, 15 Aug 2012 15:49:22 +0000]
Fix for storing CPHS MWI messages with store type

CPHS MWI messages of store type were treated as discard type.
This resulted in that no CPHS MWI messages with text was ever
shown to the user.

Change-Id: I42f80a084c35a813933052d4a676e16b2c4e2d9d

6 years agoam fc354419: Merge "Telephony: Fix NPE in CdmaConnection"
Wink Saville [Wed, 6 Feb 2013 21:48:58 +0000]
am fc354419: Merge "Telephony: Fix NPE in CdmaConnection"

# By Alex Yakavenka
# Via Alex Yakavenka (1) and Gerrit Code Review (1)
* commit 'fc354419d48b1ded8ce951670c4069780f22e273':
  Telephony: Fix NPE in CdmaConnection

6 years agoMerge "Telephony: Fix NPE in CdmaConnection"
Wink Saville [Wed, 6 Feb 2013 21:18:31 +0000]
Merge "Telephony: Fix NPE in CdmaConnection"

6 years agoTelephony: Fix NPE in CdmaConnection
Alex Yakavenka [Wed, 6 Feb 2013 19:39:07 +0000]
Telephony: Fix NPE in CdmaConnection

When card is removed and call gets terminated
getUiccCardApplication will return null

Change-Id: Ic861e5b5ee8515de431c33152fd11d2c45a2a353

6 years agoam 89558696: Merge "Telephony: Define enable/disable APIs for Cdma CMAS"
Jake Hamby [Mon, 4 Feb 2013 23:10:28 +0000]
am 89558696: Merge "Telephony: Define enable/disable APIs for Cdma CMAS"

# By Rika Brooks
# Via Gerrit Code Review (1) and Rika Brooks (1)
* commit '895586961de9992a4feefc57b648e01d158a382c':
  Telephony: Define enable/disable APIs for Cdma CMAS

6 years agoMerge "Telephony: Define enable/disable APIs for Cdma CMAS"
Jake Hamby [Mon, 4 Feb 2013 22:13:09 +0000]
Merge "Telephony: Define enable/disable APIs for Cdma CMAS"

6 years agoTelephony: Define enable/disable APIs for Cdma CMAS
Rika Brooks [Tue, 24 Jul 2012 01:36:14 +0000]
Telephony: Define enable/disable APIs for Cdma CMAS

- Define enableCellBroadcastRange, disableCellBroadcastRange,
  enableCellBroadcast, disableCellBroadcast for Cdma broadcast.
  Create CdmaBroadcastRangeManager extended from existing IntRangeManager.

Change-Id: I5d70175862547475f49e08328ab3dcc5560e9096

6 years agoam 5dcd8d72: Merge "Fix failed test case when running framework auto test."
Wink Saville [Thu, 31 Jan 2013 16:33:33 +0000]
am 5dcd8d72: Merge "Fix failed test case when running framework auto test."

# By xiaohui wang
# Via Gerrit Code Review (1) and Henrik Baard (1)
* commit '5dcd8d72466272a5773bbfac251884c8e7a4300c':
  Fix failed test case when running framework auto test.

6 years agoMerge "Fix failed test case when running framework auto test."
Wink Saville [Thu, 31 Jan 2013 16:11:40 +0000]
Merge "Fix failed test case when running framework auto test."

6 years agoFix failed test case when running framework auto test.
xiaohui wang [Wed, 30 Jan 2013 09:19:55 +0000]
Fix failed test case when running framework auto test.

The method RetryManager.setRetryCount was modified in
f186b07b463447707117e2b54fc02f7ed30d6e43, However the
corresponding test cases were not updated and now fail.

The reason for failing is that setRetryCount no longer resets
the variable mRetryForever as it used to, and therefore
isRetryNeeded() returns true instead of false failing the
testcases.

Change-Id: Icbf23ada8000fab93ee34087e125d9b12d7e7897

6 years agoam 69c5b8c7: Merge "Send correct screen state when radio available."
Wink Saville [Mon, 28 Jan 2013 19:36:16 +0000]
am 69c5b8c7: Merge "Send correct screen state when radio available."

# By Bin Li
# Via Bin Li (1) and Gerrit Code Review (1)
* commit '69c5b8c7c41614d0d5fc131a9f26c403a9d30de0':
  Send correct screen state when radio available.

6 years agoMerge "Send correct screen state when radio available."
Wink Saville [Mon, 28 Jan 2013 19:06:54 +0000]
Merge "Send correct screen state when radio available."

6 years agoam 5b5a06f5: Merge "Telephony: Don\'t start RilReceiver when not needed"
Wink Saville [Fri, 25 Jan 2013 02:16:15 +0000]
am 5b5a06f5: Merge "Telephony: Don\'t start RilReceiver when not needed"

# By Alex Yakavenka
# Via Alex Yakavenka (1) and Gerrit Code Review (1)
* commit '5b5a06f5d63561411d04d70900b55af23c44ef10':
  Telephony: Don't start RilReceiver when not needed

6 years agoMerge "Telephony: Don't start RilReceiver when not needed"
Wink Saville [Fri, 25 Jan 2013 01:46:21 +0000]
Merge "Telephony: Don't start RilReceiver when not needed"

6 years agoTelephony: Don't start RilReceiver when not needed
Alex Yakavenka [Wed, 6 Jun 2012 20:23:57 +0000]
Telephony: Don't start RilReceiver when not needed

Basebandless targets don't need RilReceiver.

Change-Id: I510cc6f0100219af9479738fc4b48c7ab85ea666
CRs-Fixed: 367918

6 years agoam 44c9723a: Merge "Telephony: Mark SIM SMS as read after importing it"
Wink Saville [Thu, 24 Jan 2013 18:23:52 +0000]
am 44c9723a: Merge "Telephony: Mark SIM SMS as read after importing it"

# By Rika Brooks
# Via Gerrit Code Review (1) and Rika Brooks (1)
* commit '44c9723a49d352a8bcf3051eeb1885c80fb20e44':
  Telephony: Mark SIM SMS as read after importing it

6 years agoMerge "Telephony: Mark SIM SMS as read after importing it"
Wink Saville [Thu, 24 Jan 2013 17:21:47 +0000]
Merge "Telephony: Mark SIM SMS as read after importing it"

6 years agoSend correct screen state when radio available.
Bin Li [Wed, 23 Jan 2013 07:00:27 +0000]
Send correct screen state when radio available.

Change-Id: I098ffd06916d9d37272ee3c8c57a4d7e21e564c6
Signed-off-by: Bin Li <libin@marvell.com>

6 years agoam c09d9845: Merge "Fixes Binder Buffer leak after crashing com.android.smspush process"
Wink Saville [Thu, 24 Jan 2013 01:34:03 +0000]
am c09d9845: Merge "Fixes Binder Buffer leak after crashing com.android.smspush process"

# By Maunik Shah
# Via Gerrit Code Review (1) and Maunik Shah (1)
* commit 'c09d9845ab719c8224d3f2c610a612bf9489bc6e':
  Fixes Binder Buffer leak after crashing com.android.smspush process

6 years agoam 36001ade: Merge "Reset data stall watch dog after doing recovery"
Wink Saville [Thu, 24 Jan 2013 01:34:02 +0000]
am 36001ade: Merge "Reset data stall watch dog after doing recovery"

# By Bin Li
# Via Bin Li (1) and Gerrit Code Review (1)
* commit '36001adedf90a3a0077d36b869822643ae01ad1b':
  Reset data stall watch dog after doing recovery

6 years agoMerge "Fixes Binder Buffer leak after crashing com.android.smspush process"
Wink Saville [Thu, 24 Jan 2013 01:06:35 +0000]
Merge "Fixes Binder Buffer leak after crashing com.android.smspush process"

6 years agoMerge "Reset data stall watch dog after doing recovery"
Wink Saville [Thu, 24 Jan 2013 00:37:27 +0000]
Merge "Reset data stall watch dog after doing recovery"

6 years agoam 57516407: Merge "Telephony: Correct the typo in RIL.java"
Wink Saville [Wed, 23 Jan 2013 23:15:47 +0000]
am 57516407: Merge "Telephony: Correct the typo in RIL.java"

# By Jiju Kinattingal
# Via Gerrit Code Review (1) and Jiju Kinattingal (1)
* commit '575164076e184002a8545dffa5056d38f07639c2':
  Telephony: Correct the typo in RIL.java

6 years agoMerge "Telephony: Correct the typo in RIL.java"
Wink Saville [Wed, 23 Jan 2013 22:56:48 +0000]
Merge "Telephony: Correct the typo in RIL.java"

6 years agoam ef5afe19: Merge "Interprete mmi code *21*num# as registration."
Wink Saville [Wed, 23 Jan 2013 21:01:40 +0000]
am ef5afe19: Merge "Interprete mmi code *21*num# as registration."

* commit 'ef5afe19131035ef5b359096f1ef64f9a55795d9':
  Interprete mmi code *21*num# as registration.

6 years agoMerge "Interprete mmi code *21*num# as registration."
Wink Saville [Wed, 23 Jan 2013 20:14:42 +0000]
Merge "Interprete mmi code *21*num# as registration."

6 years agoInterprete mmi code *21*num# as registration.
Bin Li [Wed, 23 Jan 2013 08:25:24 +0000]
Interprete mmi code *21*num# as registration.

Per 3GPP TS 22.030 6.5.2

A call forwarding request with a singel * would
be interpreted as registration if containing a
forwarded-to number, or an activation if not.

Change-Id: Iaf5754e49454819892fe054938ef8819f759d6bd
Signed-off-by: Bin Li <libin@marvell.com>

6 years agoReset data stall watch dog after doing recovery
Bin Li [Wed, 23 Jan 2013 07:20:52 +0000]
Reset data stall watch dog after doing recovery

Without resetting data stall watch dog, one data
stall will lead to radio reset if there is no
data traffic after doing recovery.

Change-Id: Icc7b1e7f160cd0c8910f7132d7c2fea0d29803e5
Signed-off-by: Bin Li <libin@marvell.com>

6 years agoFixes Binder Buffer leak after crashing com.android.smspush process
Maunik Shah [Thu, 22 Nov 2012 16:06:53 +0000]
Fixes Binder Buffer leak after crashing com.android.smspush process

After many crashes of com.android.smspush process under low memory
condition, binder buffer used to get overflow as there is a leak
in buffer.
This fix restricts the leak in binder buffer by unbinding it upon
com.android.smspush process crash.

Change-Id: I0b5cd4ef282ec9f12693337001c084ce60db4555

6 years agoTelephony: Mark SIM SMS as read after importing it
Rika Brooks [Wed, 22 Aug 2012 22:31:34 +0000]
Telephony: Mark SIM SMS as read after importing it

The GCF test case 8.2.2 checks if the status byte of the SMS is marked as read
after reading the SMS from SIM. The status byte is marked as read after the
SMS is imported from the SIM if it is not already marked.
Fix to check for null IccFilehandler which can happen if card is not present.

Extract common functions from Sim/RuimSmsInterfaceManager to their parent
class IccSmsInterfaceManager.

Change-Id: I4f226bc873786904527d7d822a67dfc14f05a327

6 years agoam 135bf68d: Merge "Wrong terminal response for proactive command length errors"
Wink Saville [Thu, 17 Jan 2013 22:43:55 +0000]
am 135bf68d: Merge "Wrong terminal response for proactive command length errors"

* commit '135bf68d7638dc5d8524ba84db80e35452772aa1':
  Wrong terminal response for proactive command length errors

6 years agoMerge "Wrong terminal response for proactive command length errors"
Wink Saville [Thu, 17 Jan 2013 21:38:22 +0000]
Merge "Wrong terminal response for proactive command length errors"

6 years agoWrong terminal response for proactive command length errors
Sanny Shang [Wed, 16 Jan 2013 13:52:50 +0000]
Wrong terminal response for proactive command length errors

This fix is at least reported by an internal test suite
written with the 3gpp specification as base, can not
guarantee that it exists "in the wild" however the
specification is clear.

According to 3gpp11.14, chapter 6.10.6 "Length errors",

If the total lengths of the SIMPLE-TLV data objects are not
consistent with the length given in the BER-TLV data object,
then the whole BER-TLV data object shall be rejected. The
result field in the TERMINAL RESPONSE shall have the error
condition "Command data not understood by ME".

Change-Id: I128442ea4755679b0e5524a31c01b3c690e45ab0

6 years agoam 58eafee3: Merge "Telephony: Unregister from UiccController when disposed"
Wink Saville [Tue, 15 Jan 2013 21:17:12 +0000]
am 58eafee3: Merge "Telephony: Unregister from UiccController when disposed"

* commit '58eafee3bd34563621378d49d8879538c411a7c8':
  Telephony: Unregister from UiccController when disposed

6 years agoMerge "Telephony: Unregister from UiccController when disposed"
Wink Saville [Tue, 15 Jan 2013 20:35:45 +0000]
Merge "Telephony: Unregister from UiccController when disposed"

6 years agoTelephony: Unregister from UiccController when disposed
Alex Yakavenka [Fri, 28 Sep 2012 00:45:06 +0000]
Telephony: Unregister from UiccController when disposed

Change-Id: I296d3f292a72d2f8181f866bd1de7637c8333c63

6 years agoam 367c5f28: Merge "Telephony: Support ShiftJIS encoding and Skip unsupported bearer...
Jake Hamby [Mon, 14 Jan 2013 22:34:14 +0000]
am 367c5f28: Merge "Telephony: Support ShiftJIS encoding and Skip unsupported bearer data subparam"

* commit '367c5f28da409e05f1c853893512bdf53472c41e':
  Telephony: Support ShiftJIS encoding and Skip unsupported bearer data subparam

6 years agoMerge "Telephony: Support ShiftJIS encoding and Skip unsupported bearer data subparam"
Jake Hamby [Mon, 14 Jan 2013 21:39:40 +0000]
Merge "Telephony: Support ShiftJIS encoding and Skip unsupported bearer data subparam"

6 years agoTelephony: Support ShiftJIS encoding and Skip unsupported bearer data subparam
Rika Brooks [Fri, 29 Jun 2012 23:21:32 +0000]
Telephony: Support ShiftJIS encoding and Skip unsupported bearer data subparam

Support Shift-JIS CHARi encoding type per 3GPP2 C.R1001 section 9.1.

3GPP2 C.S0015-B, v2.0, table 4.5-1 shows bearer data subparam ID
above 0x17 is reserved. Fix to skip reserved bearer data subparams
instead of throwing CodingException.

Change-Id: Ib83e7e72189a267421ba5fd77695b8f684ef00e2

6 years agoam 392afa32: Merge "Parameters length is able to be over 127 bytes."
Wink Saville [Fri, 11 Jan 2013 17:37:08 +0000]
am 392afa32: Merge "Parameters length is able to be over 127 bytes."

* commit '392afa3290831e856edfe16155638879c8218be6':
  Parameters length is able to be over 127 bytes.

6 years agoMerge "Parameters length is able to be over 127 bytes."
Wink Saville [Fri, 11 Jan 2013 16:43:02 +0000]
Merge "Parameters length is able to be over 127 bytes."

6 years agoParameters length is able to be over 127 bytes.
kyunga1.kim [Thu, 16 Aug 2012 11:58:12 +0000]
Parameters length is able to be over 127 bytes.

When the received message has user data over 127 bytes,
occur the parse error exception because using readByte().
Therefore we use readUnsignedByte() for reading parameters length.
Signed-off-by: kyunga kim <kyunga1.kim@lge.com>
Change-Id: I195807ee59a0d9117e0d835a4b3c355635337be0
(cherry picked from commit 700e7df9a0ac480e688d37786c0c146d5d1e406d)

6 years agoam eabfd15c: Merge "Telephony: Don\'t ack CB messages"
Jake Hamby [Wed, 9 Jan 2013 23:36:37 +0000]
am eabfd15c: Merge "Telephony: Don\'t ack CB messages"

* commit 'eabfd15c321499201e9d150fe16288c2d43b7787':
  Telephony: Don't ack CB messages

6 years agoam dc446013: Merge "Fix mRequestsLists -> mRequestList"
Robert Greenwalt [Wed, 9 Jan 2013 23:36:36 +0000]
am dc446013: Merge "Fix mRequestsLists -> mRequestList"

* commit 'dc4460132214aeb1b4767c0225b4595a7ae4a4d4':
  Fix mRequestsLists -> mRequestList

6 years agoMerge "Telephony: Don't ack CB messages"
Jake Hamby [Wed, 9 Jan 2013 23:03:50 +0000]
Merge "Telephony: Don't ack CB messages"

6 years agoMerge "Fix mRequestsLists -> mRequestList"
Robert Greenwalt [Wed, 9 Jan 2013 22:55:31 +0000]
Merge "Fix mRequestsLists -> mRequestList"

6 years agoam ac57a399: Merge "Telephony: Check SmsTracker\'s mSentIntent for null"
Jake Hamby [Wed, 9 Jan 2013 22:21:10 +0000]
am ac57a399: Merge "Telephony: Check SmsTracker\'s mSentIntent for null"

* commit 'ac57a399534677ebfcfef530f1529d5d7f3d3c49':
  Telephony: Check SmsTracker's mSentIntent for null

6 years agoMerge "Telephony: Check SmsTracker's mSentIntent for null"
Jake Hamby [Wed, 9 Jan 2013 22:17:58 +0000]
Merge "Telephony: Check SmsTracker's mSentIntent for null"

6 years agoFix mRequestsLists -> mRequestList
Robert Greenwalt [Wed, 9 Jan 2013 21:37:35 +0000]
Fix mRequestsLists -> mRequestList

first of several fixes.

Change-Id: I362fbfd446aed6714e6c89204ee095d03474c26f

6 years agoam 713f8792: Merge "Telephony: Fix decodeCallbackNumber for Cdma CMAS"
Jake Hamby [Wed, 9 Jan 2013 20:02:13 +0000]
am 713f8792: Merge "Telephony: Fix decodeCallbackNumber for Cdma CMAS"

* commit '713f879213955e734d7b092033797c0f756fd95c':
  Telephony: Fix decodeCallbackNumber for Cdma CMAS

6 years agoMerge "Telephony: Fix decodeCallbackNumber for Cdma CMAS"
Jake Hamby [Wed, 9 Jan 2013 19:45:35 +0000]
Merge "Telephony: Fix decodeCallbackNumber for Cdma CMAS"

6 years agoam cd17a8e5: Merge "Telephony: Update call timer for phantom call"
Wink Saville [Tue, 8 Jan 2013 02:17:31 +0000]
am cd17a8e5: Merge "Telephony: Update call timer for phantom call"

* commit 'cd17a8e56bf5fa1af49d4447e65dc69e4741e7bf':
  Telephony: Update call timer for phantom call

6 years agoMerge "Telephony: Update call timer for phantom call"
Wink Saville [Tue, 8 Jan 2013 01:10:55 +0000]
Merge "Telephony: Update call timer for phantom call"

6 years agoTelephony: Update call timer for phantom call
Uma Maheswari Ramalingam [Sat, 1 Dec 2012 01:20:07 +0000]
Telephony: Update call timer for phantom call

For phantom call, update connectTimeReal via onConnectedInOrOut().
connectTimeReal is used to calculate the call duration per
getDurationMillis().
If phantom call is in HOLDING state, update holdingStartTime via
onStartedHolding().  holdingStartTime is used to calculate hold time
per getHoldDurationMillis().

Change-Id: I716f75b7565b5e869403c48de3dd190e2b425626

6 years agoam bf358b36: Merge "Telephony: Support for LTE network modes"
Wink Saville [Fri, 4 Jan 2013 17:41:25 +0000]
am bf358b36: Merge "Telephony: Support for LTE network modes"

* commit 'bf358b3605c3380b7b597506d09ea129e849e1da':
  Telephony: Support for LTE network modes

6 years agoMerge "Telephony: Support for LTE network modes"
Wink Saville [Fri, 4 Jan 2013 17:14:42 +0000]
Merge "Telephony: Support for LTE network modes"

6 years agoam e1500d9d: Merge "Telephony: Add support for SMS-SUBMIT."
Wink Saville [Fri, 4 Jan 2013 07:23:10 +0000]
am e1500d9d: Merge "Telephony: Add support for SMS-SUBMIT."

* commit 'e1500d9d6042ca9e6f4503e82c31bd17997d70a6':
  Telephony: Add support for SMS-SUBMIT.

6 years agoMerge "Telephony: Add support for SMS-SUBMIT."
Wink Saville [Fri, 4 Jan 2013 06:17:08 +0000]
Merge "Telephony: Add support for SMS-SUBMIT."

6 years agoTelephony: Add support for SMS-SUBMIT.
Bin Li [Thu, 27 Dec 2012 03:21:12 +0000]
Telephony: Add support for SMS-SUBMIT.

Change-Id: I2b0887ae6b28decb38576cac60f1314ff8b73e1d
Signed-off-by: Bin Li <libin@marvell.com>

6 years agoam c06ff6ba: Merge "Telephony: add support for additional information"
Wink Saville [Thu, 3 Jan 2013 01:07:16 +0000]
am c06ff6ba: Merge "Telephony: add support for additional information"

* commit 'c06ff6babf825f7215b0c17ddf4edc12a7346698':
  Telephony: add support for additional information

6 years agoMerge "Telephony: add support for additional information"
Wink Saville [Thu, 3 Jan 2013 00:25:49 +0000]
Merge "Telephony: add support for additional information"

6 years agoTelephony: Support for LTE network modes
Uma Maheswari Ramalingam [Tue, 10 Jul 2012 21:55:39 +0000]
Telephony: Support for LTE network modes

Change-Id: I8833fe3e56c94303f05111a94433b1b9e6568d2f
Depends-On: I93c102f92ff2d10856d91108bb50fe5c0f06ad66

6 years agoam ac2f6291: Merge "Telephony: Look for CSS indicator for voice+data"
Wink Saville [Wed, 2 Jan 2013 20:26:37 +0000]
am ac2f6291: Merge "Telephony: Look for CSS indicator for voice+data"

* commit 'ac2f6291229c09b4e362ec42370544d9e471226e':
  Telephony: Look for CSS indicator for voice+data

6 years agoam aa54f8e0: Merge "Telephony: Add uicc debug info to DebugService"
Wink Saville [Wed, 2 Jan 2013 20:26:36 +0000]
am aa54f8e0: Merge "Telephony: Add uicc debug info to DebugService"

* commit 'aa54f8e0f58fad29d358693e32baa2d1e52f9b70':
  Telephony: Add uicc debug info to DebugService

6 years agoMerge "Telephony: Look for CSS indicator for voice+data"
Wink Saville [Wed, 2 Jan 2013 20:08:32 +0000]
Merge "Telephony: Look for CSS indicator for voice+data"

6 years agoMerge "Telephony: Add uicc debug info to DebugService"
Wink Saville [Wed, 2 Jan 2013 19:39:33 +0000]
Merge "Telephony: Add uicc debug info to DebugService"

6 years agoam f9905b7e: Merge "Fix telephony-common build error"
Wink Saville [Wed, 2 Jan 2013 16:55:23 +0000]
am f9905b7e: Merge "Fix telephony-common build error"

* commit 'f9905b7efadf03fd9e0bd06385461ccf0bbeaed1':
  Fix telephony-common build error

6 years agoMerge "Fix telephony-common build error"
Wink Saville [Wed, 2 Jan 2013 16:18:23 +0000]
Merge "Fix telephony-common build error"

6 years agoTelephony: Add uicc debug info to DebugService
Alex Yakavenka [Fri, 28 Dec 2012 20:51:33 +0000]
Telephony: Add uicc debug info to DebugService

Change-Id: I03be52f97ea84808d608c48b4e6ffa2454e2a67c

6 years agoFix telephony-common build error
Roger Chen [Wed, 19 Dec 2012 04:30:12 +0000]
Fix telephony-common build error

Build command: make telephony-common

Build error info as below:
make: *** No rule to make target `frameworks/opt/telephony/
src/java/com/android/internal/telephony/AdnRecord.aidl',
needed by `out/target/common/obj/JAVA_LIBRARIES/
telephony-common_intermediates/src/src/java/com/android/
internal/telephony/IIccPhoneBook.java'.  Stop.

Change-Id: Id836d0777a1c7f17dab0153e94054c7d20441d93
Signed-off-by: Roger Chen <cxr514033970@gmail.com>

6 years agoam f4fa4789: Merge "telephony: Fix issue in short code ussd detection"
Wink Saville [Thu, 20 Dec 2012 21:47:08 +0000]
am f4fa4789: Merge "telephony: Fix issue in short code ussd detection"

* commit 'f4fa4789ba7ac74c157da46bc597f75739f6c44d':
  telephony: Fix issue in short code ussd detection

6 years agoam 58be8804: Merge "Fix build error while were doing incremental build"
Wink Saville [Thu, 20 Dec 2012 21:47:03 +0000]
am 58be8804: Merge "Fix build error while were doing incremental build"

* commit '58be8804124094488dc6727223f309e2e1aaf223':
  Fix build error while were doing incremental build

6 years agoMerge "telephony: Fix issue in short code ussd detection"
Wink Saville [Thu, 20 Dec 2012 20:04:28 +0000]
Merge "telephony: Fix issue in short code ussd detection"

6 years agoMerge "Fix build error while were doing incremental build"
Wink Saville [Thu, 20 Dec 2012 19:17:18 +0000]
Merge "Fix build error while were doing incremental build"

6 years agoFix build error while were doing incremental build
Roger Chen [Thu, 20 Dec 2012 05:09:12 +0000]
Fix build error while were doing incremental build

Build command: make telephony-common

Build error info as below:
make: *** No rule to make target `frameworks/opt/telephony/
src/java/com/android/internal/telephony/AdnRecord.aidl',
needed by `out/target/common/obj/JAVA_LIBRARIES/
telephony-common_intermediates/src/src/java/com/android/
internal/telephony/IIccPhoneBook.java'.  Stop.

Change-Id: I028a3d7ed94c63849bbbc5063142037f1d1ac7bf
Signed-off-by: Roger Chen <cxr514033970@gmail.com>

6 years agoMerge from AOSP staging branch
Jean-Baptiste Queru [Tue, 18 Dec 2012 23:15:36 +0000]
Merge from AOSP staging branch

Change-Id: I757d7389ccc8912dff89a76e038bab9c03d7af1a

6 years agoMerge "Telephony: Start DataStallAlarm only on Data CONNECTED state"
Wink Saville [Tue, 18 Dec 2012 18:28:31 +0000]
Merge "Telephony: Start DataStallAlarm only on Data CONNECTED state"

6 years agotelephony: Fix issue in short code ussd detection
Jeevaka Badrappan [Tue, 14 Aug 2012 10:21:42 +0000]
telephony: Fix issue in short code ussd detection

According to the 3PGG TS 22.030 specification
Figure 3.5.3.2: A 1 or 2 digit "short code" is
treated as USSD if it is entered while on a call or
does not satisfy the condition (exactly 2 digits
&& starts with '1').

Following rule is already addressed in function
GsmMmiCode::newFromDialString.

If the user of the device enters one digit followed
by the #-key, phone shall initiate a USSD/SS command

Change-Id: I70795da1fb5144d1c91059f6200b74b5fd33de22
Author: Jeevaka Badrappan <jeevaka.badrappan@intel.com>
Signed-off-by: Jack Ren <jack.ren@intel.com>
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
Author-tracking-BZ: 28800

6 years agoTelephony: Start DataStallAlarm only on Data CONNECTED state
Jeevaka Badrappan [Wed, 5 Dec 2012 09:23:27 +0000]
Telephony: Start DataStallAlarm only on Data CONNECTED state

Telephony framework uses AlarmManager for recovery mechanism of data
stalled issue.
Framework configures the ELAPSED_REALTIME_WAKEUP alarm for every
6minutes irrespective of the data state. Due to this,quiet a few
wakeups are seen even when the device is not connected to Mobile
Data network.

Fix is to check the Data connection state before starting
this alarm.

Change-Id: I219bff9199e5ce70bbcd05c95d65731886215fe9
Author: Jeevaka Badrappan <jeevaka.badrappan@intel.com>
Signed-off-by: Jeevaka Badrappan <jeevaka.badrappan@intel.com>
Signed-off-by: Arun Ravindran <arun.ravindran@intel.com>
Signed-off-by: Shuo Gao <shuo.gao@intel.com>
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
Signed-off-by: Jack Ren <jack.ren@intel.com>
Author-tracking-BZ: 28494

6 years agoMerge "CatService: Add support for GET_CHANNEL_STATUS p-cmd."
Wink Saville [Tue, 18 Dec 2012 00:46:15 +0000]
Merge "CatService: Add support for GET_CHANNEL_STATUS p-cmd."