Merge commit 'df8356ff9a2f1fab44bb3aea26c5da0a9f23a4ad' into gingerbread-plus-aosp
* commit 'df8356ff9a2f1fab44bb3aea26c5da0a9f23a4ad':
Workaround for a QCOM issue where the output buffer size advertised by the AVC encoder
Merge commit 'd851e6fea59bcc5a9ad4ddcdfde63e9443640ef2' into gingerbread-plus-aosp
* commit 'd851e6fea59bcc5a9ad4ddcdfde63e9443640ef2':
Unhide camera fps range API and deprecate old ones.
Original preview frame rate API assumes the frame rate
is fixed. It does not not work with auto frame rate camera.
Change-Id: I1233a22ed64d42f167432085716bb6bfc3d36bbf
Merge commit 'b86365ad74a197f2af6d70eedeb19083e31a9686' into gingerbread-plus-aosp
* commit 'b86365ad74a197f2af6d70eedeb19083e31a9686':
Suppress the video recording start signal
Merge commit '577615c98e390f8417e07844d04304eac5b0e911' into gingerbread-plus-aosp
* commit '577615c98e390f8417e07844d04304eac5b0e911':
Better support for rtsp (normal play-)time display. Better seek support, timeout if no packets arrive for too long.
Merge commit 'e250c220d1bb3bd117641add94ee7465a82f085c' into gingerbread-plus-aosp
* commit 'e250c220d1bb3bd117641add94ee7465a82f085c':
We accidentally always aborted after 10 secs, even if the connection was fine.
Some assets are failing to read from ZIP files. This adds a bit more
debugging to figure out what's going on.
Change-Id: Id90e10546c54c85069a34478fbc28bc2523bda5d
Merge commit 'ae66946bd9e9f1168241c75196d2379b43e3ca30' into gingerbread-plus-aosp
* commit 'ae66946bd9e9f1168241c75196d2379b43e3ca30':
fix a race in SF buffer management
Merge commit '9020595b7f376bb414c9a6dba216dec76ababb17' into gingerbread-plus-aosp
* commit '9020595b7f376bb414c9a6dba216dec76ababb17':
Fix closing tag in docs.
Merge commit '225ad9cb184c94e29e4e0fb89d5e7d043e399ca4' into gingerbread-plus-aosp
* commit '225ad9cb184c94e29e4e0fb89d5e7d043e399ca4':
DO NOT MERGE Text selection: tapping on selection opens context menu
Merge commit 'b8fd047311e329f2b8dbe3d228488ba844718ee1' into gingerbread-plus-aosp
* commit 'b8fd047311e329f2b8dbe3d228488ba844718ee1':
Fix for 512 limit in assetManager.list
Back key exit selection mode. No more "Stop selecting text" in second context menu.
A tap on one of the handles also triggers the second context menu.
Paste is only available on long press in first menu for empty text fields.
Change-Id: Ic4fa00458d4f617a81885436b53d4fc923347609
Adds a fire-and-forget save method (startCommit) to the
SharedPreferences.Editor, which is the way most people use it anyway.
This commit adds the implementation. The previous commit added the
interface and docs:
previous change: Idf9934b445da1fb72b79f0192218b47c0a7f5a34
git commit: edf32d0131
In addition, this change:
-- adds a generic "runPendingWorkFinishers" mechanism to
ActivityThread to wait on async operations that are still
in flight and use it for this.
-- ties runPendingWorkFinishers into Activity.onPause,
BroadcastReceiver, and Service.
-- makes sSharedPreferences keyed on name, not File, to avoid
unnnecessary allocations
-- documents and guarantees what thread
OnSharedPreferenceChangeListener callbacks run on
-- makes a few things in frameworks/base use startCommit(), notably
Preference.java (which was ignoring the return value anyway)
Change-Id: I1c8db60ad45643226fe6d246d3e513eeb7bd0ebd
Merge commit 'c28bf25bc5d9fd729b9e6593168cf61a87cf586c' into gingerbread-plus-aosp
* commit 'c28bf25bc5d9fd729b9e6593168cf61a87cf586c':
DO NOT MERGE copy selected text on tap
Merge commit 'cc033bd367a445d5e3f8de919cd155505b25274c' into gingerbread-plus-aosp
* commit 'cc033bd367a445d5e3f8de919cd155505b25274c':
Fix some bugs in SettingsProvider that I introduced the other day.
