Merge commit 'dd644c179c1bf47d82d776d7f644e4fc1467159d' into gingerbread-plus-aosp
* commit 'dd644c179c1bf47d82d776d7f644e4fc1467159d':
Fallback to SharedPreferences$Editor.commit() when no apply() exists.
Gingerbread widened the SharedPreferences.Editor interface, adding an
apply() method. Most people don't implement this interface
themselves, but a couple apps do.
A few spots in the core framework take a SharedPreferences[.Editor]
from apps, which might be a pre-Gingerbread implementation without an
apply() method. This patch makes sure we never depend on the presence
of an apply() method, falling back to commit() if apply() isn't
available.
Change-Id: I32693ac9227a60b694526a26a30234fb17a40581
Merge commit '4e1658afb8a79aa03a5ca712b02b2a33fb00bf6d' into gingerbread-plus-aosp
* commit '4e1658afb8a79aa03a5ca712b02b2a33fb00bf6d':
Avoid pre-processing images when they won't be used
Add mock ril controller commands and test cases:
- testStartIncomingCallAndHangup: test start incoming cal and hangup remote
- testSetCallTransitionFlag: test call transition flag and call state transition
Change-Id: I25ff8ef7931159ef7101b5e8638b9b7438db4f66
Merge commit '1e6a3a53fc4d56e3a0f86c8721dedfd46e738a32' into gingerbread-plus-aosp
* commit '1e6a3a53fc4d56e3a0f86c8721dedfd46e738a32':
Added more robust tracking and cancelation of events.
This change fixes several issues where events would be dropped in the
input dispatch pipeline in such a way that the dispatcher could not
accurately track the state of the input device.
Given more robust tracking, we can now also provide robust cancelation
of input events in cases where an application might otherwise become
out of sync with the event stream due to ANR, app switch, policy decisions,
or forced focus transitions.
Pruned some of the input dispatcher log output.
Moved the responsibility for calling intercept*BeforeQueueing into
the input dispatcher instead of the input reader and added support for
early interception of injected events for events coming from trusted
sources. This enables behaviors like injection of media keys while
the screen is off, haptic feedback of injected virtual keys, so injected
events become more "first class" in a way.
Change-Id: Iec6ff1dd21e5f3c7feb80ea4feb5382bd090dbd9
Merge commit '77880ae4187d92506848249585687fc9d0c0dd25'
* commit '77880ae4187d92506848249585687fc9d0c0dd25':
SipService: add permission check for using API
Some users of the download API (eg system update) need to get the
actual local filename of a downloaded file, not just a content URI.
Change-Id: I877e2776e778c1712f654ba5c840bfe6ed3fe60f
Merge commit '66e606040a521b81033ff75025620436c050c82e' into gingerbread-plus-aosp
* commit '66e606040a521b81033ff75025620436c050c82e':
GPS: More HAL initialization cleanup
- Register buffers with Gralloc when unflattening a GraphicBuffer (rather than
doing it in the Surface class).
- Add support for a GraphicBuffer that wraps an android_native_window_t*.
Change-Id: I029ac086111bbac800e5ca37eb505f558b718cd8
Merge commit 'f5cae7d1c516ad233d7ec833c23c046e2501ec56'
* commit 'f5cae7d1c516ad233d7ec833c23c046e2501ec56':
DO NOT MERGE: Disconnect PBAP while disconnecting HFP profile.
Merge commit '6c4609ada4526eea2fca4eef043d27dd07026e0a'
* commit '6c4609ada4526eea2fca4eef043d27dd07026e0a':
DO NOT MERGE Only show edge glow effect on 1 side at a time.
Merge commit '4b7ff734611666a68471c97fabb6f516efab25cd'
* commit '4b7ff734611666a68471c97fabb6f516efab25cd':
Suppress harder for echo without affecting the volume of real voice.
Merge commit 'f10929fb350395c21edd2cba7641479afe75e750'
* commit 'f10929fb350395c21edd2cba7641479afe75e750':
Minor fix for InputReader support for non-touchscreen devices.
Merge commit '4f2c8cc86ad1b4c65806d7547407c60ea36b8abe'
* commit '4f2c8cc86ad1b4c65806d7547407c60ea36b8abe':
DO NOT MERGE Only show edge glow effect on 1 side at a time.
Merge commit 'd185494da653d1d0e4f20d28c2dd53764994fc3f'
* commit 'd185494da653d1d0e4f20d28c2dd53764994fc3f':
Port mock ril controller and tests to GB. DO NOT MERGE
Merge commit '22cb4ef8ce9c4d5536ac5cee5c40b82bfa56ccc5'
* commit '22cb4ef8ce9c4d5536ac5cee5c40b82bfa56ccc5':
Switch Looper back to using poll() instead of epoll().
Merge commit '7a64e3a6f3e9f4de9cb097f604187d06268c23be' into gingerbread-plus-aosp
* commit '7a64e3a6f3e9f4de9cb097f604187d06268c23be':
DO NOT MERGE Set the cap at alpha to 80% of the total available.
No matter how much the user drags, the alpha like the height
should not get greater than a max and that max is 80% of what
is available in the image.
Change-Id: I57d181d6ea685461a44ed3ee29f83a675bc07fbc
Merge commit '3ed792d59cda9f9023201d80f5bdc62d4cef3090' into gingerbread-plus-aosp
* commit '3ed792d59cda9f9023201d80f5bdc62d4cef3090':
Don't perform DNS lookup in android.net.Proxy.isLocalHost
Turning off all debug logging is a good thing, but it leaves us blind when errors come in.
bug:3075537
Change-Id: I8a4e7f2ce094574ec45cec268bdbc46449540c9f
Merge commit 'bb70837397e3fb437b7b4443b37d7a83c11e6e43'
* commit 'bb70837397e3fb437b7b4443b37d7a83c11e6e43':
Work to support switching transport streams mid-stream and signalling discontinuities to the decoder.
