Merge commit '2e99245e0e0d64ba6ab9227154c7fad132559c01'
* commit '2e99245e0e0d64ba6ab9227154c7fad132559c01':
Changed handling of onQueryCompelete to not use mimeType.
NullPointerException at
com.android.internal.telephony.gsm.GSMPhone.handleMessage(GSMPhone.java)
Failing to retrieved the IMSI number from SIM card could lead to
an exception. A null pointer check will prevent this.
Change-Id: I26760543484504c8d35215bfb1e8f1ae664aeade
Merge commit '08fb5851bbaf11ecac0cac0de321942bfbf6a630' into gingerbread-plus-aosp
* commit '08fb5851bbaf11ecac0cac0de321942bfbf6a630':
Add flag to skip restoring network seletion.
Merge commit 'bbc80d3436ee52f28bd26f1f0cb01dc4dd183ccc' into gingerbread-plus-aosp
* commit 'bbc80d3436ee52f28bd26f1f0cb01dc4dd183ccc':
Changed handling of onQueryCompelete to not use mimeType.
Using mimeType causes an IPC request to contacts which can
be slow. This can cause an ANR of the Phone app. This change
parses the URL and to decide which column to use for the person_id
and thus should not cause an ANR.
bug: 3060704
Change-Id: I750c72746c7269e162f0338c0a3e00230a600519
+ CallManager: fix getFirstActiveRingingCall(), getActiveFgCall(), getFirstActiveBgCall()
+ Set DisconnectCause to be INCOMING_REJECTED when a call is rejected
http://b/issue?id=3049671
Change-Id: Ica1d81ca4b71ab0ceb2ab437b82bbb4ccf86fe92
Adding changes to be able to have access to missing data to SUPL
(celld, imsi, WAP_PUSH and SMS)
Change-Id: I0207f7f7ea6595ed3fd7021cb732feddf52e4cf9
Signed-off-by: Mike Lockwood <lockwood@android.com>
Let SipSession return it when UnknownHostException is caught.
Add DisconnectCause.SERVER_UNREACHABLE in Connection and have SipPhone report
it when receiving SERVER_UNREACHABLE from SipSession.
http://b/issue?id=3061691
Change-Id: I944328ba3ee30c0a9386e89b5c4696d4d9bde000
This reverts commit bdf11be97bd732e8891ae19342c937da6e659afa.
Fix a missing import from manual merge.
Change-Id: If373626f07250cbfe07e5c04cf02ad9ee5a0ab2a
Merge commit 'edec27a1e9ffc022e68f0d6200ba90499da4b9e9'
* commit 'edec27a1e9ffc022e68f0d6200ba90499da4b9e9':
Do not explicity disconnect Data during power down for 1x.
Merge commit 'd531c9ebe18f0b554d29d3c3b8e4a00f84dae97a' into gingerbread-plus-aosp
* commit 'd531c9ebe18f0b554d29d3c3b8e4a00f84dae97a':
Do not explicity disconnect Data during power down for 1x.
Merge commit '0a69f597604254bc37721b135ab612eaacdd0cbd' into gingerbread-plus-aosp
* commit '0a69f597604254bc37721b135ab612eaacdd0cbd':
Rub in a little 'ol log-b-gone.
* Fix some typos in Javadoc and log messages.
* Remove redundant initializer in BluetoothAdapter.readOutOfBandData()
* Use canonical "UTF-8" charset name instead of "UTF8" in
BluetoothDevice.convertPinToBytes()
Change-Id: I58cd5dc48a7ad0053d204c5f590b4b3d438d8672
Merge commit '421c34c162098efe870574844a7ee49812bbb929' into gingerbread-plus-aosp
* commit '421c34c162098efe870574844a7ee49812bbb929':
SipPhone: revise hangup() in SipCall and SipConnection.
Exceptions may throw during canTake() as the peer may cancel the call and
result in a race with this method call.
Change-Id: I61903d601d8f9b2dcb4c4fbe1586e2c1a1069109
http://b/issue?id=3033868
Make them DISCONNECTED immediately. Don't enter DISCONNECTING state and wait
until SipSession ends the session. SipSession will get timed out eventually
but PhoneApp/user don't need to know this detail and wait.
This should fix the bug:
http://b/issue?id=3027719
Change-Id: Ida5a1bd09d08b9d591721384b4978127619aab51
