Merge commit '6fe795ecd35c4d49822d349424fc71b660577dfc' into gingerbread-plus-aosp
* commit '6fe795ecd35c4d49822d349424fc71b660577dfc':
Do another contact lookup if the first one fails and...
Merge commit 'baced375ba5f374445c44a2115700d69693794a0' into gingerbread-plus-aosp
* commit 'baced375ba5f374445c44a2115700d69693794a0':
Silently reject a ringing call when another call is dialing/ringing.
Merge commit '1180f2a099a134c40f923c7e4162a5e7d7ca0184' into gingerbread-plus-aosp
* commit '1180f2a099a134c40f923c7e4162a5e7d7ca0184':
Remove ringtone API from SipAudioCall.
+ 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
- Add wakelock for driver start/stop to ensure a wifilock
acquisition kick starts driver. Also cleaned up state machine
driver start/stop behavior.
- Add periodic scans when driver is started to ensure wifi
reconnections when wifilock exists or when user chooses
never to sleep
- some minor clean up
Change-Id: I844eb70491d5aa2f8c8933b3d8dd01ba237ee534
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
This change adds support to Stagefright for doing OMX video decoding directly
into buffers dequeued from an ANativeWindow. It does this by registering the
dequeued buffers with the OMX component using an Android-specific OMX
extension, and then exchanging buffers between the OMX component and the
ANativeWindow.
Change-Id: Ida66f836503255a68d378c6903d96dfe9747ce87
After the recent Chromium merge to 7.0.540.0, it seems that we are no
longer allowed to use a profile unique id of 0. Set the unique id
in the AutoFillProfile class so that WebKit can access it.
Change-Id: I88cd1e91b8c6043c732a1709a89fda4a3c9f921f
After UMS mounted, isUsbMassStorageConnected() will always return true even if USB is disconnected.
It's because mUmsEnabling will always be ture.
Change-Id: Ib24b2359ea2684eb0a9faeb880f383e87630e6e1
This just adds an extra entrypoint to BrowserFrame. It delegates
directly to the identical method in CallbackProxy, and from there
downloads are handled in the same way as before.
See matching C++ change in external/webkit (I81300400)
Change-Id: I87e71debe475d0d24e13a5763fbe803e3cd78cf5
(watch out auto-merge conflict for SipAudioCall).
Bug: 3113033, related CL: https://android-git/g/#change,75185
Change-Id: Ib48d3b990e229e0b341e47e10e76934e1a50d10f
Merge commit 'b595e094e3901ff8a224eaf7d4869e7d2e5649dd' into gingerbread-plus-aosp
* commit 'b595e094e3901ff8a224eaf7d4869e7d2e5649dd':
Return display name in SipConnection.getCnapName().
o Do not count the reserved space for moov if the meta data size is small
o Do not count the extra 1KB disturbing small file estimation.
o Reduce the default minimum reserved space from 4 KB to 3 KB.
o Estimate the moov size based on both duration AND file size limit is set
and set it to the smaller estimated value.
low risk change
bug - 3111983
Change-Id: I6ac2adb979d8cc12d6b4f1813d000c989add0199
Merge commit 'f4cd9be0390135269e22e42fd2e1fe61fdcf9863' into gingerbread-plus-aosp
* commit 'f4cd9be0390135269e22e42fd2e1fe61fdcf9863':
fix [2236865] STOPSHIP: bump soft gl and egl minor version number
Merge commit '6fbc5d9c19388e8f1c9a1833bc0e15fcf6b499f1' into gingerbread-plus-aosp
* commit '6fbc5d9c19388e8f1c9a1833bc0e15fcf6b499f1':
DO NOT MERGE. Make sure to invalidate after pulling on an edgeglow.
