Merge commit '01ee34d7078afcf4d938d4c3ea29a4b9fdcc02f8' into gingerbread-plus-aosp
* commit '01ee34d7078afcf4d938d4c3ea29a4b9fdcc02f8':
Import revised translations. DO NOT MERGE
Merge commit 'df992ac9cc54cedb3e384617ed683a2d1a24d38b' into gingerbread-plus-aosp
* commit 'df992ac9cc54cedb3e384617ed683a2d1a24d38b':
ALoopers can now be named (useful to distinguish threads).
As per CPHS4_2.WW6, CPHS B.4.7.1, the most significant bit of
Value Added Services Group(0xC0) info, controls operator selection menu.
-If this bit is set, display operator selection menu to user.
-If this bit is not set do not display operator selection menu to user,
set Network Selection Mode to Automatic.
Change-Id: Icca4898abced0b0beb94c3434448a26eae72008b
Merge commit 'fd04143a47770256dabcfa4d8447127b3ec8b2bf' into gingerbread-plus-aosp
* commit 'fd04143a47770256dabcfa4d8447127b3ec8b2bf':
Shutdown when capacity is 0% and no charging or when battery is dead
Merge commit 'a3faa923a0ac8d0d58409fcf7c99e8ff7b261ef4'
* commit 'a3faa923a0ac8d0d58409fcf7c99e8ff7b261ef4':
Support pre-loading browser plugins on the system image.
Merge commit '6726d6bb1a30167786864c445cbe0370ee0dd58c' into gingerbread-plus-aosp
* commit '6726d6bb1a30167786864c445cbe0370ee0dd58c':
Support pre-loading browser plugins on the system image.
This reverts commit 27cf4ad88ff8ba2b64d806b0ebb0181b1f42c888.
Ironically, this change (to fix the build in gingerbread) ended up
breaking the (previously-green) build in master. It probably should
have been marked to not merge. Either way, this fixes the master
build
Merge commit '554d8726f8df053c07e0c68e43f060019c11264e'
* commit '554d8726f8df053c07e0c68e43f060019c11264e':
More obsolete status bar bits. DO NOT MERGE
Merge commit '0776deff39b7fe8435f2cbf6aa84bf202bac70f5' into gingerbread-plus-aosp
* commit '0776deff39b7fe8435f2cbf6aa84bf202bac70f5':
More obsolete status bar bits. DO NOT MERGE
- changed client_id->clientId, mClient_id->mClientId
- there was a bug in the condition for calling
signalReadComplete_lock() in stop. We should call it only when
!mLastReadCompleted and also if the current client has not already
completed its read (this second check was missing before).
Change-Id: I9a57cf6b5c6f3260883a6c74d0c7b22f675c422e
Merge commit 'a5fe77d004091bd9521d087c2572f587191afbfc'
* commit 'a5fe77d004091bd9521d087c2572f587191afbfc':
Workaround for a QCOM issue where the output buffer size advertised by the AVC encoder
Merge commit '705c2e66dcb358c865cf912a5496825088044b79'
* commit '705c2e66dcb358c865cf912a5496825088044b79':
Unhide camera fps range API and deprecate old ones.
Merge commit '05c1cadaeaf272a70acc889bfccd607648058470'
* commit '05c1cadaeaf272a70acc889bfccd607648058470':
Better support for rtsp (normal play-)time display. Better seek support, timeout if no packets arrive for too long.
Merge commit 'e25e03612e1a2988ed83f24d2658cf0898fd1944'
* commit 'e25e03612e1a2988ed83f24d2658cf0898fd1944':
We accidentally always aborted after 10 secs, even if the connection was fine.
The problem is that the audio policy manager does not handle the input devices
when forced use for telephony is changed.
The problem does not appear in a call over PSTN becasue only teh output devices drives the
routing of in call audio to/from the base band.
The fix consists in modifying AudioPolicyManagerBase::setForceUse() to check for active inputs
and update the input device if needed.
Change-Id: I0d36d1f5eef1cce527929180c29b025439902f10
