1313 Commits

Author SHA1 Message Date
Robert Greenwalt
ec44c26f42 Make getDataEnabled take more into account.
getDataEnabled and getAnyDataEnabled ignored mMasterDataEnabled.
bug: 2216392

Change-Id: Ic3ae0808d2a02057ddf5056d3e01f754f2e57f5c
2010-11-11 15:18:51 -08:00
John Wang
a6689ddbba am 1ed7d65b: am fac4a689: Merge "Fix the audio mode glitch during hangup." into gingerbread
* commit '1ed7d65b5d781d10de91a199fbd94d6d445d1def':
  Fix the audio mode glitch during hangup.
2010-11-10 19:32:42 -08:00
John Wang
1ed7d65b5d am fac4a689: Merge "Fix the audio mode glitch during hangup." into gingerbread
* commit 'fac4a689f86b0d46a2c76cec0a6ce2f4bac2a22a':
  Fix the audio mode glitch during hangup.
2010-11-10 19:28:31 -08:00
John Wang
d19f44f3e3 Fix the audio mode glitch during hangup.
Fix bug # 3136179.

Keep audio mode as IN_CALL during hangup DISCONNECTING state

to prevent the NORMAL and IN_CALL glitch in auiod setMode.

Change-Id: I5513a3d5c65bd13ac054c9718c4dbd7d6db9eaf3
2010-11-10 15:35:51 -08:00
Robert Greenwalt
8e7e0a9fd5 Fix data state change callbacks
Initial state should be unknown or we miss the first connected change.
Don't send a disconnected msg when changing network types.
Filter out redundent disconnects.
Add some logging.

bug:3060742
Change-Id: Idc797c1276b7417337a91ed60b12b1bf392d57c0
2010-11-09 16:28:51 -08:00
Wink Saville
3611e5c939 Allow DataConnectionTrackers to manage multiple data connections.
This is the first step to allow simultaneous data connections.

Bug: 2441767
Change-Id: Ia625cfe94b771a6958401adca84b80543fbdb35c
2010-11-03 17:14:16 -07:00
Robert Greenwalt
26ba124903 Merge "Add some network/phone type constants." 2010-11-03 17:05:24 -07:00
Robert Greenwalt
962a990a45 Add some network/phone type constants.
Support for LTE (and SIP-based voice) and the stepping-stone eHPRD.

bug:3125398
Change-Id: Ied3d96fa09d9c758a82a2fd1817f55db711d1a4f
2010-11-03 17:02:37 -07:00
Hung-ying Tyan
8d1b2a17d9 Throw proper exceptions in SipManager
instead of silently returning null and causing NPE in applications as returning
null is not documented in the javadoc.

Add connection to the connection list in SipCall after dial() succeeds so that
we don't need to clean up if it fails. The original code will cause the failed
connection to continue to live in the SipCall and in next dial() attempt, a new
connection is created and the in-call screen sees two connections in the call
and thus shows conference call UI.

Bug: 3157234, 3157387
Change-Id: Iabc3235f781c4f1e09384a67ad56b09ad2c12e5e
2010-11-03 18:09:31 +08:00
Irfan Sheriff
ed4f28b492 Set country code in the driver and remove channel set
With dual band support, using country code
settings is the way to go

Bug: 2936741
Change-Id: I760dce4c43b1af19ee205c28f0d287420c8d9e85
2010-11-02 16:35:56 -07:00
Rekha Kumar
ee7d1973ff Telephony: Add support to read 3GPP2 sms from CSIM/RUIM
Add parser to parse 3GPP2 format sms stored in CSIM/RUIM card

Change-Id: I4720ba7602fcc1b078de0d5fea34247541242c1c
2010-11-02 13:14:38 -07:00
Jeff Brown
4d396052de Fix policy issues when screen is off.
Rewrote interceptKeyBeforeQueueing to make the handling more systematic.
Behavior should be identical except:
- We never pass keys to applications when the screen is off and the keyguard
  is not showing (the proximity sensor turned off the screen).
  Previously we passed all non-wake keys through in this case which
  caused a bug on Crespo where the screen would come back on if a soft key
  was held at the time of power off because the resulting key up event
  would sneak in just before the keyguard was shown.  It would then be
  passed through to the dispatcher which would poke user activity and
  wake up the screen.
- We propagate the key flags when broadcasting media keys which
  ensures that recipients can tell when the key is canceled.
- We ignore endcall or power if canceled (shouldn't happen anyways).

Changed the input dispatcher to not poke user activity for canceled
events since they are synthetic and should not wake the device.

Changed the lock screen so that it does not poke the wake lock when the
grab handle is released.  This fixes a bug where the screen would come
back on immediately if the power went off while the user was holding
one of the grab handles because the sliding tab would receive an up
event after screen turned off and release the grab handles.

Fixed a couple of issues where media keys were being handled inconsistently
or not at all, particularly in the case of the new PAUSE, PLAY
and RECORD keys.

Bug: 3144874
Change-Id: Ie630f5fb6f128cfdf94845f9428067045f42892c
2010-11-01 15:00:25 -07:00
Wink Saville
fd2d013027 Add PhoneStateListener.onOtaspChanged.
Bug: 3102320
Change-Id: I46e8d33a4ed80e5e074e92135653d57598d4c865
2010-11-01 11:46:57 -07:00
Johannes Carlsson
3ffccab786 Release reference when putting RILRequest back into the pool.
In order to reduce object creation the RILRequest objects are
stored in an array when it is unused (max 4). This avoids GC
of the object. The object in turn has references to other
objects which sometimes hold large memory chunks. This fix
releases these references since they are not used anyway.

This will make it possible to GC the Message (mResult) which
in some cases holds references to a Bitmap which sometimes
leads to OutOfMemoryException. The reference is cleared
anyway in RILRequest.obtain(...)

Change-Id: I3b895bc39b5e2f3ab7cc8297c3583ea78e0ebc77
2010-10-27 08:28:14 +02:00
David Brown
85e0ff8f3d Fix bug 3121292: Contact photo not shown correctly for SIP calls
The problem was that when we did a contact lookup based on a SIP address,
the resulting CallerInfo object did not have the person_id field set
correctly.  That meant we had no way to look up the photo for that person.

This was because of a missing case in the logic to determine which column
(in the resulting cursor) to use for the person_id lookup.  We were
handling lookups fine in the PhoneLookup and Phone tables, but were
missing a case for direct lookups in the Data table (which is how we look
up SIP addresses.)

The fix is to add a case for URIs like
"content://com.android.contacts/data" when looking up the person_id.

Also, since the person_id lookup is pretty hairy (and includes ~20 lines
of comments to explain what it's doing!) refactor it out into a helper
method.

TESTED: Both SIP and PSTN calls; verified that contact name *and* photo
are displayed correctly in all cases.

Bug: 3121292
Change-Id: I2b0083cc5394c1a49bbdc9a4e5651854aedb82f7
2010-10-26 14:22:03 -07:00
Eric Laurent
977d362251 am ecae8a43: am 1a58d9c3: Merge "Partial fix for issue 3124895." into gingerbread 2010-10-26 08:17:07 -07:00
Eric Laurent
ecae8a43b7 am 1a58d9c3: Merge "Partial fix for issue 3124895." into gingerbread 2010-10-26 08:14:48 -07:00
Eric Laurent
164a8f86c7 Partial fix for issue 3124895.
When a SIP call is put on hold and no other call is active, the audio mode should not be
switched to incall.

Change-Id: I1307330f10cbfb9c4223bcb9dc4faa79778750af
2010-10-25 19:45:39 -07:00
John Huang
a35827a8e9 am 33051ad1: am 7dc08fb0: Merge "Fix connect duration for un-established SIP calls." into gingerbread
Merge commit '33051ad1785a84ad5d814d6acf337b54d5fab36c'

* commit '33051ad1785a84ad5d814d6acf337b54d5fab36c':
  Fix connect duration for un-established SIP calls.
2010-10-21 15:29:48 -07:00
Hung-ying Tyan
2cef210f53 am 940b4d1c: am 6037a056: Fix n-way conf call in SipPhone.
Merge commit '940b4d1c4548d3296ac9fc66cce0cc213b5aa8a8'

* commit '940b4d1c4548d3296ac9fc66cce0cc213b5aa8a8':
  Fix n-way conf call in SipPhone.
2010-10-21 13:43:43 -07:00
John Huang
33051ad178 am 7dc08fb0: Merge "Fix connect duration for un-established SIP calls." into gingerbread
Merge commit '7dc08fb070ff7455e794fc81645ccb4349cd152f' into gingerbread-plus-aosp

* commit '7dc08fb070ff7455e794fc81645ccb4349cd152f':
  Fix connect duration for un-established SIP calls.
2010-10-21 11:46:55 -07:00
Jeff Hamilton
6967f09604 am e55806a5: am 23392a84: Fix the build.
Merge commit 'e55806a55561c992086ddff717aca27206fa0c5d'

* commit 'e55806a55561c992086ddff717aca27206fa0c5d':
  Fix the build.
2010-10-21 10:56:19 -07:00
Hung-ying Tyan
fbd21b5875 am d691b36c: am 6fe795ec: Do another contact lookup if the first one fails and...
Merge commit 'd691b36cdea314585b6aa17556ed4c35bb65a69e'

* commit 'd691b36cdea314585b6aa17556ed4c35bb65a69e':
  Do another contact lookup if the first one fails and...
2010-10-21 10:56:11 -07:00
Hung-ying Tyan
821f087989 am fd0ba81c: am baced375: Merge "Silently reject a ringing call when another call is dialing/ringing." into gingerbread
Merge commit 'fd0ba81c02c0881f7534333afc8c53e241158a3d'

* commit 'fd0ba81c02c0881f7534333afc8c53e241158a3d':
  Silently reject a ringing call when another call is dialing/ringing.
2010-10-21 10:56:02 -07:00
Hung-ying Tyan
164cd438fb am 51028569: am 1180f2a0: Merge "Remove ringtone API from SipAudioCall." into gingerbread
Merge commit '5102856947595cffc1cceb11b9e4c5baf70b2e82'

* commit '5102856947595cffc1cceb11b9e4c5baf70b2e82':
  Remove ringtone API from SipAudioCall.
2010-10-21 10:55:33 -07:00
Hung-ying Tyan
4e00a8d582 am e894ff7a: am b595e094: Merge "Return display name in SipConnection.getCnapName()." into gingerbread
Merge commit 'e894ff7a7693fdc406b4f4b28cfd1d9d7d966b38'

* commit 'e894ff7a7693fdc406b4f4b28cfd1d9d7d966b38':
  Return display name in SipConnection.getCnapName().
2010-10-21 10:53:49 -07:00
Brad Fitzpatrick
385a753dea resolved conflicts for merge of 368fdba4 to master
Change-Id: I42b7b433c86a71a5da5db67109f056a280077c9d
2010-10-21 07:39:10 -07:00
Hung-ying Tyan
5d9e3bbb9d Fix connect duration for un-established SIP calls.
Bug: 3118364
Change-Id: I931b675de04a3aac70b45d6bae27ab42a84f2d1e
2010-10-21 15:54:46 +08:00
Hung-ying Tyan
940b4d1c45 am 6037a056: Fix n-way conf call in SipPhone.
Merge commit '6037a056ea0dda27a286ddcb527b323b58a1c7c7' into gingerbread-plus-aosp

* commit '6037a056ea0dda27a286ddcb527b323b58a1c7c7':
  Fix n-way conf call in SipPhone.
2010-10-20 14:03:43 -07:00
Jeff Hamilton
e55806a555 am 23392a84: Fix the build.
Merge commit '23392a84bcb961d3fd50142ec40ce6ac6db89018' into gingerbread-plus-aosp

* commit '23392a84bcb961d3fd50142ec40ce6ac6db89018':
  Fix the build.
2010-10-20 13:57:26 -07:00
Hung-ying Tyan
d691b36cde am 6fe795ec: Do another contact lookup if the first one fails and...
Merge commit '6fe795ecd35c4d49822d349424fc71b660577dfc' into gingerbread-plus-aosp

* commit '6fe795ecd35c4d49822d349424fc71b660577dfc':
  Do another contact lookup if the first one fails and...
2010-10-20 13:57:20 -07:00
Hung-ying Tyan
fd0ba81c02 am baced375: Merge "Silently reject a ringing call when another call is dialing/ringing." into gingerbread
Merge commit 'baced375ba5f374445c44a2115700d69693794a0' into gingerbread-plus-aosp

* commit 'baced375ba5f374445c44a2115700d69693794a0':
  Silently reject a ringing call when another call is dialing/ringing.
2010-10-20 13:56:59 -07:00
Hung-ying Tyan
5102856947 am 1180f2a0: Merge "Remove ringtone API from SipAudioCall." into gingerbread
Merge commit '1180f2a099a134c40f923c7e4162a5e7d7ca0184' into gingerbread-plus-aosp

* commit '1180f2a099a134c40f923c7e4162a5e7d7ca0184':
  Remove ringtone API from SipAudioCall.
2010-10-20 13:54:25 -07:00
Hung-ying Tyan
6037a056ea Fix n-way conf call in SipPhone.
+ Avoid concurrent modification when forming >3-way conf call.
+ Revise SipConnection.separate() to put the newly separated call to foreground.

Bug: 3114987

Change-Id: If6204e7e3cc05f4a516c33657a368b53a0ad014d
2010-10-21 03:59:04 +08:00
Jeff Hamilton
23392a84bc Fix the build.
Change-Id: Id5bfa0f91e6ec687201a320a1eb4d8a46050875e
2010-10-20 14:20:29 -05:00
Hung-ying Tyan
6fe795ecd3 Do another contact lookup if the first one fails and...
it's a SIP call and the peer's username is all numeric. The all-numeric username
could be a PSTN number.

Bug: 3105116 (case #2)

Change-Id: I1de9cfac3aab1c4c89935176264d07693adb5e7d
2010-10-21 02:54:57 +08:00
Hung-ying Tyan
88e3f0ad28 Silently reject a ringing call when another call is dialing/ringing.
http://b/issue?id=3109483
http://b/issue?id=3103072

Change-Id: I34f13225319c7f2a41e1ea9e25811866432ab809
2010-10-21 02:38:04 +08:00
Hung-ying Tyan
9b449e5606 Remove ringtone API from SipAudioCall.
(watch out auto-merge conflict for SipAudioCall).

Bug: 3113033, related CL: https://android-git/g/#change,75185

Change-Id: Ib48d3b990e229e0b341e47e10e76934e1a50d10f
2010-10-20 22:51:22 +08:00
Hung-ying Tyan
e894ff7a76 am b595e094: Merge "Return display name in SipConnection.getCnapName()." into gingerbread
Merge commit 'b595e094e3901ff8a224eaf7d4869e7d2e5649dd' into gingerbread-plus-aosp

* commit 'b595e094e3901ff8a224eaf7d4869e7d2e5649dd':
  Return display name in SipConnection.getCnapName().
2010-10-19 23:03:25 -07:00
Hung-ying Tyan
b595e094e3 Merge "Return display name in SipConnection.getCnapName()." into gingerbread 2010-10-19 23:00:16 -07:00
Hung-ying Tyan
538e58fc75 Return display name in SipConnection.getCnapName().
Bug: 3105116 (case #1)

Change-Id: Iedf3c8de07213c786cffb861bd52c3b4a768a86c
2010-10-20 11:21:55 +08:00
Joe Onorato
368fdba47a am bdf1706a: Merge "Reduce logging." into gingerbread
Merge commit 'bdf1706ac680c0fe74765b8d6d34823b8ac05306' into gingerbread-plus-aosp

* commit 'bdf1706ac680c0fe74765b8d6d34823b8ac05306':
  Reduce logging.
2010-10-19 12:29:43 -07:00
Joe Onorato
431bb22695 Reduce logging.
Remember, the system and main logs are
    - Shared resources
    - Primarily for recording problems
    - To be used only for large grained events during normal operation

Bug: 3104855
Change-Id: I136fbd101917dcbc8ebc3f96f276426b48bde7b7
2010-10-19 15:08:05 -04:00
David Brown
97d88927f2 am e3c50a54: am cebe5b2e: Merge "Reduce CallerInfoAsyncQuery logging in user builds (STOPSHIP cleanup)" into gingerbread
Merge commit 'e3c50a5470f64fd99438d6fd985f88d9fe20919a'

* commit 'e3c50a5470f64fd99438d6fd985f88d9fe20919a':
  Reduce CallerInfoAsyncQuery logging in user builds (STOPSHIP cleanup)
2010-10-15 13:40:16 -07:00
Wink Saville
1b422d8cd8 am 090ac9f7: am a3100314: Merge "Remove some PII." into gingerbread
Merge commit '090ac9f7dd883aa75c899745182471d409a2b762'

* commit '090ac9f7dd883aa75c899745182471d409a2b762':
  Remove some PII.
2010-10-13 19:40:16 -07:00
John Wang
b57832140e am 7a26ebdf: am 844a6b3c: Turn off additional debug.
Merge commit '7a26ebdf0d5ba62c06ca0b8cb2b3280f008885ef'

* commit '7a26ebdf0d5ba62c06ca0b8cb2b3280f008885ef':
  Turn off additional debug.
2010-10-13 19:14:56 -07:00
David Brown
e3c50a5470 am cebe5b2e: Merge "Reduce CallerInfoAsyncQuery logging in user builds (STOPSHIP cleanup)" into gingerbread
Merge commit 'cebe5b2e01f8ebbf9089aebc386caecea232df76' into gingerbread-plus-aosp

* commit 'cebe5b2e01f8ebbf9089aebc386caecea232df76':
  Reduce CallerInfoAsyncQuery logging in user builds (STOPSHIP cleanup)
2010-10-13 17:50:43 -07:00
David Brown
d34d30ac2e Reduce CallerInfoAsyncQuery logging in user builds (STOPSHIP cleanup)
Bug: 3095005

Change-Id: Ide96756282d17252fac16a27cc184ea314a8b31a
2010-10-13 17:02:33 -07:00
Hung-ying Tyan
99f92ac7a4 am f5b7c855: am f5201ab7: Keep original phone number in SipConnection.
Merge commit 'f5b7c855fbb69e8614dab5ca15639228a2428784'

* commit 'f5b7c855fbb69e8614dab5ca15639228a2428784':
  Keep original phone number in SipConnection.
2010-10-13 17:02:08 -07:00
Wink Saville
090ac9f7dd am a3100314: Merge "Remove some PII." into gingerbread
Merge commit 'a310031438877a7b70a6ac30eb2f2b33e06907e6' into gingerbread-plus-aosp

* commit 'a310031438877a7b70a6ac30eb2f2b33e06907e6':
  Remove some PII.
2010-10-12 14:21:10 -07:00