Merge commit '357f8209f3aec63fa2779da4eeab8825f80b0a41' into gingerbread-plus-aosp
* commit '357f8209f3aec63fa2779da4eeab8825f80b0a41':
Finetune some of the prefetcher parameters to a) buffer as much as froyo did b) ensure that keepalives actually trigger a network read instead of just draining internal buffers
Merge commit '6feaa46496bae85adbe10e84611592612f898081' into gingerbread-plus-aosp
* commit '6feaa46496bae85adbe10e84611592612f898081':
Enable passing parameters to the MediaWriter at runtime (at start() call).
- estimate the moov box size for mp4 file writer based on the file
size/duration limit and target bit rate.
- can switch to use 64 bit file offset at runtime
rebased
Change-Id: Ibbe1f57e91ab2605820d5d96e8048d11e5559c53
Merge commit '5a905ceb063bd31170d3d869efcd051cbd8e4e13' into gingerbread-plus-aosp
* commit '5a905ceb063bd31170d3d869efcd051cbd8e4e13':
Track maximum amplitude and fix getMaxAmplitude()
when assigning a smart pointer to another one, we need to make
sure to read all the data we need from the right-hand-side
reference (the assignee) before we decRef the assigned.
This bug would cause linked-list of smart-pointers to fail
miserably.
Change-Id: Ibb554c15fddf909f7737c632b7c80322e80ea93f
Merge commit '081bc5c47d8a980e6eafa70ddafcd89981586391' into gingerbread-plus-aosp
* commit '081bc5c47d8a980e6eafa70ddafcd89981586391':
fix [2793164] Spam 2x/second with TOT master in SurfaceFlinger
Make sure to not use GL_TEXTURE_EXTERNAL when it's not supported
by the GL. The error was harmless, but annoying.
Change-Id: I571a9a9b05d35da51420950a6a6e95629067efd0
Merge commit '8896783dc1d31c5274b277c364da0ffe7cc27cca' into gingerbread-plus-aosp
* commit '8896783dc1d31c5274b277c364da0ffe7cc27cca':
Updated StatusBar test app for new notifications API.
Merge commit '87160757e827e8e158d233de09d70e7128184729' into gingerbread-plus-aosp
* commit '87160757e827e8e158d233de09d70e7128184729':
Basic handling of Notifications with fullScreenIntent.
New actions:
- Toggle activity's immersive mode
- Post a priority notification with fullScreenIntent
that launches an alert-like activity
Change-Id: Ie38372209985577b6db856924c19914c000e1cec
If a Notification has a non-null fullScreenIntent AND the
topmost Activity is not immersive, that PendingIntent will
fire (presumably causing a nice dialog or full-screen
activity to appear).
Immersive mode handling for FLAG_HIGH_PRIORITY Notifications
is still unimplemented (although the fullScreenIntent will
be suppressed in immersive mode).
Note that currently your fullScreenIntent notification will
also get posted to the status bar, so you're responsible for
clearing it out (e.g. in onPause in your alert intent). See
forthcoming changes to StatusBarTest for an example.
Change-Id: Ie750d1b7bcc788bd29ee1d8626f971dd47fd2817
Merge commit '7dacda1142379df1f1f9854c24e452acdea98436' into gingerbread-plus-aosp
* commit '7dacda1142379df1f1f9854c24e452acdea98436':
docs: Remove the TOS from download flow and remove TOS entirely because
Merge commit '56c778e6cfb2bd47ceae57d81e6b949da306e2e8' into froyo-plus-aosp
* commit '56c778e6cfb2bd47ceae57d81e6b949da306e2e8':
docs: Remove the TOS from download flow and remove TOS entirely because
Merge commit '56c778e6cfb2bd47ceae57d81e6b949da306e2e8' into gingerbread
* commit '56c778e6cfb2bd47ceae57d81e6b949da306e2e8':
docs: Remove the TOS from download flow and remove TOS entirely because
Merge commit '0a0edccafbd464cfe52fdcb60597e1dd58ca73f9' into gingerbread-plus-aosp
* commit '0a0edccafbd464cfe52fdcb60597e1dd58ca73f9':
Fix the notification vibration setting and add a test app that lets you recover from the busted
Merge commit '2529a45339b7e02d9d2b813358bcecd144a971ea' into gingerbread-plus-aosp
* commit '2529a45339b7e02d9d2b813358bcecd144a971ea':
Make bad notifications crash their application.
Implement notification manager handling of bad notifications, to
call a new activity manager to have the owner's process crashed
(if there is one).
Change-Id: Ib15e8d0c598756f3b39c99cc2045c18e054daf6b
Merge commit '5340bffd8bb2599d15ee79cca3c62d2e7c7ea961' into gingerbread-plus-aosp
* commit '5340bffd8bb2599d15ee79cca3c62d2e7c7ea961':
Properly note the current active restore set's token
Merge commit '5827d3eaf3c53d1dc3ab0d638d935c219a5515a6' into froyo-plus-aosp
* commit '5827d3eaf3c53d1dc3ab0d638d935c219a5515a6':
Properly note the current active restore set's token
Merge commit '5827d3eaf3c53d1dc3ab0d638d935c219a5515a6' into gingerbread
* commit '5827d3eaf3c53d1dc3ab0d638d935c219a5515a6':
Properly note the current active restore set's token
- Move PackageInfo out of ActivityThread, renaming to LoadedApk.
- Rename some of the other PacakgeInfo inner classes to better
represent what they are.
- Rename HistoryRecord to ActivityRecord.
- Introduce AppGlobals, to eventually let ActivityThread become
package scoped.
Change-Id: Ib714c54ceb3cdbb525dce3db9505f31042e88cf0
Merge commit '9bf39efb1b8527d7c46b20538cbb75bd60900b44' into gingerbread-plus-aosp
* commit '9bf39efb1b8527d7c46b20538cbb75bd60900b44':
Do not log AT command traffic by default.
Merge commit 'ab04f97855a5097815e8e7b99beb42e9b3bac388' into gingerbread-plus-aosp
* commit 'ab04f97855a5097815e8e7b99beb42e9b3bac388':
Do not log AT command traffic by default.
