{"ref":"refs/heads/gingerbread","commits":[{"author":{"name":"nadlabak","email":"2375fa63e2908bb2df59f606483a3aa92321db7a@doshaska.net"},"message":"Merge remote branch 'upstream/gingerbread' into gingerbread\n\nConflicts:\n\tcore/java/com/android/internal/widget/LockPatternUtils.java\n\tcore/res/res/layout/keyguard_screen_tab_unlock_land.xml\n\tmedia/libstagefright/MPEG4Writer.cpp\n\tmedia/libstagefright/OMXCodec.cpp\n\nChange-Id: Iabec07f40d5111f8534b652e1b97ed3a1412a1c1","url":"https://api.github.com/repos/elektroschmock/android_frameworks_base/commits/593f32f1df4f9cbc19ff43ed2e7f175927582a0f","sha":"593f32f1df4f9cbc19ff43ed2e7f175927582a0f"},{"author":{"name":"David Morgan","email":"d31781fd76998bb725a927cd11ea6797a61f4996@gmail.com"},"message":"Refactor lockscreen status views\n\nMaintain separate TextViews for the charging, alarm, and calendar status. Instead of\nusing complex logic to set and show/hide statuses, use simple visible/gone logic.\nThis also allows the next alarm and calendar event to be shown at the same time.\n\nChange-Id: I3b4c05f80d18c7d012ab73e39857f42ca82a2e88","url":"https://api.github.com/repos/elektroschmock/android_frameworks_base/commits/09e8aaf101b72ce4e7d0bbab5eedd5b7f411cc01","sha":"09e8aaf101b72ce4e7d0bbab5eedd5b7f411cc01"},{"author":{"name":"David Morgan","email":"d31781fd76998bb725a927cd11ea6797a61f4996@gmail.com"},"message":"Power widget defaults (brightness and sound)\n\nDefault behavior for the new brightness and sound power widgets\nshould be to cycle through all options and treat all of them as\nselected when first configured.\n\nChange-Id: Ie1831a8b7361bcb2dc6e9cc3c6a7d8e69796e6eb","url":"https://api.github.com/repos/elektroschmock/android_frameworks_base/commits/8b0f8342d741d8be7be69e7f7b2430a6df0c546e","sha":"8b0f8342d741d8be7be69e7f7b2430a6df0c546e"},{"author":{"name":"Danny Baumann","email":"4bceda912b479e46f041c22bcc2c9ed75fe8d5cc@web.de"},"message":"Don't wait indefinitely for camera frames.\n\nThere are multiple reasons why camera frame delivery can stop, the most\nobvious of which is a buggy camera HAL.\nIn order to not block indefinitely in case that happens, use a timeout\nwhen waiting for frames and propagate error if timeout occurs.","url":"https://api.github.com/repos/elektroschmock/android_frameworks_base/commits/fe57f3e8b41ee883307bc271902b848a775ea45a","sha":"fe57f3e8b41ee883307bc271902b848a775ea45a"},{"author":{"name":"Danny Baumann","email":"4bceda912b479e46f041c22bcc2c9ed75fe8d5cc@web.de"},"message":"Fix a couple of nasty heap corruption bugs.\n\n- When replacing the buffer pointer with another one, the allocated\n  length wasn't updated. As the TI encoder relies of those being matched\nup (it e.g. does a memset(pBuffer, 0, nAllocLen) at certain places), this\ncould lead to random memory being overwritten (or to a segfault when\nreaching the end of the mapping)\n- When replacing the buffer, the old buffer wasn't saved and restored\n  before calling freeBuffer. This led to a different address passed to\nfree() than was returned by malloc(), could lead to all kinds of weird,\nundefined behaviour.","url":"https://api.github.com/repos/elektroschmock/android_frameworks_base/commits/100847c762495356cbcb9279d4bc6fe2af8b4d62","sha":"100847c762495356cbcb9279d4bc6fe2af8b4d62"},{"author":{"name":"Danny Baumann","email":"4bceda912b479e46f041c22bcc2c9ed75fe8d5cc@web.de"},"message":"Remove dead code.\n\nAs the current mMediaBuffer is set to NULL right above this block, said\nblock will never be triggered.","url":"https://api.github.com/repos/elektroschmock/android_frameworks_base/commits/cfb296e21b41105747080119f7fa56e5010052df","sha":"cfb296e21b41105747080119f7fa56e5010052df"},{"author":{"name":"Yogesh Sadhu","email":"15bc2f1b0319cc32d3b62a03548a94034cb77d3b@codeaurora.org"},"message":"framework/base: Fix for Camera shutter sound heard twice\n\n- While back to back Camera snapshots, some times the shutter sound is heard twice.\n- The AwesomePlayer issues start on AudioPlayer first and then issues the seekTo.\n  The starting of AudioPlayer starts the AudioTrackThread in AudioTrack which starts\n  pulling the data from AudioPlayer by calling fillBuffer(). Sometimes it is observed\n  that AudioTrackThread pulls some data and writes to AudioFlinger by the time the\n  AudioPlayer->seekTo() is processed in the fillBuffer. This data is not being flushed\n  as the playback track in AudioFlinger is not in PAUSED/PAUSING state. Once the seek\n  is performed in AudioPlayer, the data comes from the beginning of the clip again.\n  This data adds to the data already present with AudioFlinger and results in shutter\n  sound being heard twice.\n- Fix by calling seekAudioIfNecessary_l before starting the AudioPlayer. This will set\n  mSeeking flag of AudioPlayer and hence seek is processed with the first fillBuffer call itself.\n\nChange-Id: Iafd5a1a3b3f5dce760ebcab7d80a895f47c22dd2\nCRs-Fixed: 277318","url":"https://api.github.com/repos/elektroschmock/android_frameworks_base/commits/69ee3675cf15e3005d388fa491bf968d23e27266","sha":"69ee3675cf15e3005d388fa491bf968d23e27266"},{"author":{"name":"Josiah Gaskin","email":"ad57f4db227faaf8eb191fa58f88bbc42588a638@google.com"},"message":"Fix String16 operator+ to actually work\n\nThis change fixes the String16 utility's operator+ function.\n\nChange-Id: Ibed7b07277b50bf178febc72b6ce497893e66f17","url":"https://api.github.com/repos/elektroschmock/android_frameworks_base/commits/9d9aa43a24bfdee313b243dd4f17bf88e8d48433","sha":"9d9aa43a24bfdee313b243dd4f17bf88e8d48433"},{"author":{"name":"Amal Paul","email":"288a28db459071989dce1e6600ac4775dab78deb@codeaurora.org"},"message":"libstagefright: Fix to handle corrupt mp3 header\n\n- Due to corrupt data in mp3 header, mp3 parser entered a loop\n  where it parses the same buffer every time.\n- This resulted in the playback failure of the clip.\n- Fixed by skipping the first buffer having the corrupted header\n\nChange-Id: I5fd60daf7b25a1216a3b491aa9f02c01e0d00472\nCRs-fixed: 312927","url":"https://api.github.com/repos/elektroschmock/android_frameworks_base/commits/d066dab11e78daeb940a39c760ba7ac92676eea8","sha":"d066dab11e78daeb940a39c760ba7ac92676eea8"},{"author":{"name":"Kiran Kumar H N","email":"a80442ec458551709d3e09f515c0c8ee6cebebf5@codeaurora.org"},"message":"Camera: Initialize the camera shutter sounds asynchronously.\n\nAs part of the camera initialization, the shutter sounds(for both\nsnapshot and recording) are loaded. This takes around 70ms. Since\nthe launch is not dependent on this, the sounds can be loaded\nasynchronously. Hence moving them to a seperate thread.","url":"https://api.github.com/repos/elektroschmock/android_frameworks_base/commits/2ccf270810c5742c0f1dd353b9fde8e7cff284c5","sha":"2ccf270810c5742c0f1dd353b9fde8e7cff284c5"},{"author":{"name":"Danesh M","email":"25b15a7bccf53d5a188f6bf82e4a8014ed9730e7@gmail.com"},"message":"RingLockScreen : Cleanup/Fixes\n\nAddressed the issue where with security on :\n\nScreen on -> Unlock screen -> At security screen turn screen off/on\n\nThis was caused by : http://review.cyanogenmod.com/#change,8777\n\nIn addition to reverting that i did a few more things to serve the original purpose,\nof that patch which was to avoid the lockscreen flash prior to unlocking.\nOn some phones this was very noticable.\n\nChange-Id: I92569aa2b0a4d2a791f99f5c9f15713cc2c2cbe9","url":"https://api.github.com/repos/elektroschmock/android_frameworks_base/commits/f762a2d50eb0093f5d70a823b2f413bf54366ae0","sha":"f762a2d50eb0093f5d70a823b2f413bf54366ae0"},{"author":{"name":"elektroschmock","email":"dea94a0844b5eabbd4facc1feb96e20a0f3b79ea@googlemail.com"},"message":"Merge remote-tracking branch 'upstream/gingerbread' into gingerbread\n\nConflicts:\n\tpackages/SystemUI/src/com/android/systemui/statusbar/powerwidget/SoundButton.java","url":"https://api.github.com/repos/elektroschmock/android_frameworks_base/commits/70423aa1087a0f4ddb183fe0334d7832c4204042","sha":"70423aa1087a0f4ddb183fe0334d7832c4204042"}],"head":"70423aa1087a0f4ddb183fe0334d7832c4204042","size":12,"push_id":49346606}