Merge commit 'd2319d8d9a2d2bc5edc9d7d20b7100f4c72cb2e1' into gingerbread-plus-aosp
* commit 'd2319d8d9a2d2bc5edc9d7d20b7100f4c72cb2e1':
New error status for "destination file already exists".
Merge commit 'ee2ef3220fd27a6332acb2f65951a7fe91e9dfa6' into gingerbread-plus-aosp
* commit 'ee2ef3220fd27a6332acb2f65951a7fe91e9dfa6':
Use PhoneBase in the phone list.
Merge commit '181e5ea8087360742b3ed0a7f2e6f8f8baa0a760' into gingerbread-plus-aosp
* commit '181e5ea8087360742b3ed0a7f2e6f8f8baa0a760':
support loading EGL libraries from /vendor/lib/egl as well as /system/lib/egl
Merge commit 'b17eae9e227475a323f61519abc8a7d35ddf8828' into gingerbread-plus-aosp
* commit 'b17eae9e227475a323f61519abc8a7d35ddf8828':
SipService: move event handling out of system server's main thread
Merge commit '97963794af1e18674dd111e3ad344d90b16c922c' into gingerbread-plus-aosp
* commit '97963794af1e18674dd111e3ad344d90b16c922c':
SIP: convert enum to static final int.
Merge commit '5b930c49b12bdb1461a18491db768c642c38d498' into gingerbread-plus-aosp
* commit '5b930c49b12bdb1461a18491db768c642c38d498':
SIP: add config flag for wifi-only configuration.
Merge commit 'ba56dfce7c751081f2289aa33533dcf4822dc12b' into gingerbread-plus-aosp
* commit 'ba56dfce7c751081f2289aa33533dcf4822dc12b':
DO NOT MERGE Tethering: Delay 1000ms before processing USB disconnect events
Merge commit '4258bfb7a9fb18907fbfbe79ec0a937b4e7382b1' into gingerbread-plus-aosp
* commit '4258bfb7a9fb18907fbfbe79ec0a937b4e7382b1':
Fix some drawing artifacts/bugs around overlays/text anchors
In the common case, there is nothing interesting happening on the native
Looper besides occasional wake ups. There is no point grabbing the
semaphore then.
Change-Id: Ib5c426d0e158dfa37891b7ff5537b6f833592fad
Merge commit 'f30fae63389a2216faf55636b95a08f35b5c3620' into gingerbread-plus-aosp
* commit 'f30fae63389a2216faf55636b95a08f35b5c3620':
Add a check to track a problem the monkey script has been triggering.
Merge commit '58e0eefeb5e2e270e2b04369bbf29fc22abda8d5' into gingerbread-plus-aosp
* commit '58e0eefeb5e2e270e2b04369bbf29fc22abda8d5':
Improve power tracking of WIFI use.
Merge commit 'b08013c312e3d849029a2f4c11889274c00f438d' into gingerbread-plus-aosp
* commit 'b08013c312e3d849029a2f4c11889274c00f438d':
Added overlay support for drawing/responding to text anchors.
Merge commit '838e93ed19879ce3d88b5be51630137d6a6999c6' into gingerbread-plus-aosp
* commit '838e93ed19879ce3d88b5be51630137d6a6999c6':
Looper: Drop default parameters in favor of a safer overload.
Merge commit 'f98197a7274c2d7da647f52b3d8b0c74492139af' into gingerbread-plus-aosp
* commit 'f98197a7274c2d7da647f52b3d8b0c74492139af':
Make sure the message dispatcher stays around until after OMX_FreeHandle is finished in case it posts some more messages during shutdown. Clear the source as soon as possible in OMXCodec's destructor.
Merge commit '524e6f62c93e9947f3f9de386c6f6be7a3085d3c' into gingerbread-plus-aosp
* commit '524e6f62c93e9947f3f9de386c6f6be7a3085d3c':
Register the new OMX components.
Merge commit '1d1583573d2099756bbbeef48d97c280edc393e0' into gingerbread-plus-aosp
* commit '1d1583573d2099756bbbeef48d97c280edc393e0':
SipPhone: do not append SIP domain to PSTN number
Merge commit '0f5843069bd419fba4fb253986645dfbca0784b7' into gingerbread-plus-aosp
* commit '0f5843069bd419fba4fb253986645dfbca0784b7':
Fix Bluetooth Javadoc to clarify the maximum device name length.
The idea is that if you're writing code that wants fd/events/data on
return from pollOnce() / pollAll() you should really pass in all of those
arguments. When I changed the Looper API earlier, it was difficult
to ensure that all callers were passing the right parameters since they
were relying on default parameters to some degree so usage mistakes
would not have been caught by the compiler.
Change-Id: I1f2812894270aaf1515017ac1616b6b312d9b565
Merge commit '08710dcd589432c5828cefce25e4b565b15de9a6' into gingerbread-plus-aosp
* commit '08710dcd589432c5828cefce25e4b565b15de9a6':
part of fix for [3004226] Cannot end the call - Proximity sensor doesn't work
Merge commit '079ed61579c3c42d78bb20cbcb11e6ffdb2aff34' into gingerbread-plus-aosp
* commit '079ed61579c3c42d78bb20cbcb11e6ffdb2aff34':
fix [2931909] SensorManger breaks when using different SensorEventListener w/ the same sensors
