Jean-Baptiste Queru
cbafdc6c15
am e2594b85: am 4cd2b343: am 98539a4e: Merge "stagefright amrwbenc: Make the mem_malloc function 64-bit safe"
...
* commit 'e2594b85093441e03150c7cfc540abc626884eaf':
stagefright amrwbenc: Make the mem_malloc function 64-bit safe
2012-01-25 08:57:36 -08:00
Jean-Baptiste Queru
df80c5b180
am a3946104: am fc2ea24b: am d80cbb8c: Merge "stagefright aacenc: Add missing newlines at the end of files"
...
* commit 'a39461047eae6022e2c0ef873ffa2c7241b393a9':
stagefright aacenc: Add missing newlines at the end of files
2012-01-25 08:57:32 -08:00
Daniel Sandler
47623f569f
am 416a1c1a: am 185c0ef7: Merge "Stop showing "No internet connection" when there is one." into ics-mr1
...
* commit '416a1c1ada0ad553613eb439823a68d3f51b1579':
Stop showing "No internet connection" when there is one.
2012-01-25 08:57:27 -08:00
Eric Laurent
6c48805c1c
am 535b0264: am 7eeaf3f0: Merge "AudioFlinger: refine mixer sleep time logic" into ics-mr1
...
* commit '535b0264a4cfa790e549bd9cd09980788f1375f4':
AudioFlinger: refine mixer sleep time logic
2012-01-25 08:57:23 -08:00
Eric Laurent
6616127218
am dd347d51: (-s ours) am 41773d46: Merge "DO NOT MERGE Revert "Revert "AudioFlinger: mix track only when really ready (2)""" into ics-mr1
...
* commit 'dd347d515d4a4e42b2aba89a8e471392026b7824':
DO NOT MERGE Revert "Revert "AudioFlinger: mix track only when really ready (2)""
2012-01-25 08:57:20 -08:00
Robert Greenwalt
0cc595295c
Merge "resolved conflicts for merge of 67cda1a0 to master"
2012-01-25 08:54:59 -08:00
George Mount
e7e77db01c
Merge "Fix auto-complete for content-editable fields."
2012-01-25 07:37:30 -08:00
Mathias Agopian
843861643e
Merge changes Ib6b6da1d,I6d9a466a
...
* changes:
improve SurfaceFlinger dumpsys
hack up frame latency measurement
2012-01-24 19:22:08 -08:00
Mathias Agopian
82d7ab6c7e
improve SurfaceFlinger dumpsys
...
It is now possible to say:
dumpsys SurfaceFlinger --latency
to print latency information about all windows
dumpsys SurfaceFlinger --latency window-name
to print the latency stats of the specified window
for instance: dumpsys SurfaceFlinger --latency SurfaceView
The data consists of one line containing global stats, followed by
128 lines of tab separated timestamps in nanosecond.
The first line currently contains the refresh period in nanosecond.
Each 128 following line contains 3 timestamps, of respectively
the app draw time, the vsync timestamp just prior the call to set and
the timestamp of the call to set.
Change-Id: Ib6b6da1d7e2e6ba49c282bdbc0b56a7dc203343a
2012-01-24 18:22:56 -08:00
Jim Miller
20ae68fee2
Merge "Fix 5907237: dismiss keyguard after the camera app launches."
2012-01-24 17:41:04 -08:00
Svetoslav Ganov
b53d4d4d0d
Merge "Fixing a typo in the NumberPicker documentation."
2012-01-24 17:02:23 -08:00
Fabrice Di Meglio
64e7a4c887
Merge "Fix bug #5901103 all_source_project_146981_Android - Android ICS LQA Regression:FA, AR, HE and TH - Font Corruption"
2012-01-24 16:57:21 -08:00
Jean-Michel Trivi
50f88f8766
Merge "More AudioManager tests"
2012-01-24 16:23:22 -08:00
Winson Chung
591bf35ade
Merge "Call ActivityManager to get the proper icon dpi."
2012-01-24 15:51:53 -08:00
Jamie Gennis
e8696a40e0
hack up frame latency measurement
...
Change-Id: I6d9a466a23285304f0e229a5649815636ab5d6af
2012-01-24 15:41:50 -08:00
Jeff Sharkey
eeae1de29e
Merge "Match WIFI_P2P data usage."
2012-01-24 15:38:54 -08:00
Svetoslav Ganov
c9e150a167
Merge "NumberPicker should not throw an exception if no enough values for wrapping."
2012-01-24 15:27:12 -08:00
Jean-Baptiste Queru
9364b5c01e
am 4cd2b343: am 98539a4e: Merge "stagefright amrwbenc: Make the mem_malloc function 64-bit safe"
...
* commit '4cd2b343272429adae1fc68e0ec0628c69e88e6d':
stagefright amrwbenc: Make the mem_malloc function 64-bit safe
2012-01-24 15:15:36 -08:00
Jean-Baptiste Queru
0fb6ec284a
am fc2ea24b: am d80cbb8c: Merge "stagefright aacenc: Add missing newlines at the end of files"
...
* commit 'fc2ea24b024f7a015d67054adb7bb09ff3a0a97b':
stagefright aacenc: Add missing newlines at the end of files
2012-01-24 15:15:33 -08:00
Jean-Baptiste Queru
0e5f19af0c
am 98539a4e: Merge "stagefright amrwbenc: Make the mem_malloc function 64-bit safe"
...
* commit '98539a4eba7677c0b1ddc12f800c7075851ef302':
stagefright amrwbenc: Make the mem_malloc function 64-bit safe
2012-01-24 15:13:45 -08:00
Jean-Baptiste Queru
2a92cabc90
am d80cbb8c: Merge "stagefright aacenc: Add missing newlines at the end of files"
...
* commit 'd80cbb8c7b13203704c00e2f5941588811c15665':
stagefright aacenc: Add missing newlines at the end of files
2012-01-24 15:13:42 -08:00
Robert Greenwalt
3f59ab7cd0
resolved conflicts for merge of 67cda1a0 to master
...
Change-Id: I5ea4398b209faa381f1c50ed6d51fed06d245af1
2012-01-24 15:02:06 -08:00
Jean-Baptiste Queru
afcc5fa9df
Merge "stagefright amrwbenc: Make the mem_malloc function 64-bit safe"
2012-01-24 14:26:32 -08:00
Chris Craik
3629c6dc6b
Merge "Allow profiling of animation performance"
2012-01-24 14:15:25 -08:00
Adam Powell
f1bdb7be7d
Merge "Update ShareActionProvider to clear the sharing activity when the task is reset."
2012-01-24 13:58:41 -08:00
Svetoslav Ganov
f0e9830e1c
Merge "Removing unused imports and swiching off deprecated APIs"
2012-01-24 13:57:05 -08:00
Daniel Sandler
08c109508e
am 185c0ef7: Merge "Stop showing "No internet connection" when there is one." into ics-mr1
...
* commit '185c0ef7e4aaa4bb978a6eb5c93c569585a07f56':
Stop showing "No internet connection" when there is one.
2012-01-24 12:57:14 -08:00
Daniel Sandler
4ca203ab44
Merge "Stop showing "No internet connection" when there is one." into ics-mr1
2012-01-24 12:54:48 -08:00
Eric Laurent
321400743a
am 7eeaf3f0: Merge "AudioFlinger: refine mixer sleep time logic" into ics-mr1
...
* commit '7eeaf3f07aa6fb10639d9f96c1367eb98c3e8839':
AudioFlinger: refine mixer sleep time logic
2012-01-24 11:51:50 -08:00
Eric Laurent
e628319fd5
am 41773d46: Merge "DO NOT MERGE Revert "Revert "AudioFlinger: mix track only when really ready (2)""" into ics-mr1
...
* commit '41773d46556aa47d4322ff89fdaf7d1345c2d1f2':
DO NOT MERGE Revert "Revert "AudioFlinger: mix track only when really ready (2)""
2012-01-24 11:51:47 -08:00
Jeff Sharkey
5040231268
Merge "Move network stats to FileRotator pattern."
2012-01-24 11:49:51 -08:00
Eric Laurent
46ae3f752e
Merge "AudioFlinger: refine mixer sleep time logic" into ics-mr1
2012-01-24 11:49:39 -08:00
Eric Laurent
95460d7cbc
Merge "DO NOT MERGE Revert "Revert "AudioFlinger: mix track only when really ready (2)""" into ics-mr1
2012-01-24 11:49:16 -08:00
Robert Greenwalt
b945a6844b
am f449ea9e: Merge "Use the carrier-given dns addrs for tethering." into ics-mr1
...
* commit 'f449ea9e96162698f4ec6d62c70750eb50744da7':
Use the carrier-given dns addrs for tethering.
2012-01-24 11:42:21 -08:00
Robert Greenwalt
4d5a59c80d
Merge "Use the carrier-given dns addrs for tethering." into ics-mr1
2012-01-24 11:40:19 -08:00
Dianne Hackborn
16fc38ea29
am a5853595: am 47163685: Merge "Another attempt at issue #5823276 : home repaints after full-screen app is exited" into ics-mr1
...
* commit 'a5853595165a6395ca41bbc17a3dd88e12259ad1':
Another attempt at issue #5823276 : home repaints after full-screen app is exited
2012-01-24 11:39:49 -08:00
Dianne Hackborn
5d7a07e3fc
am 29cd79c7: am c986d6f0: Merge "Fix issue #5906017 : Missing menu entries in portrait when in compatibility mode" into ics-mr1
...
* commit '29cd79c7b0fecd2753fc27405794c0d5b5314302':
Fix issue #5906017 : Missing menu entries in portrait when in compatibility mode
2012-01-24 11:37:24 -08:00
Daniel Sandler
98a1461a03
am 9dc211af: am a4474ae0: Merge "Detect and repair invalid layouts in the navigation bar." into ics-mr1
...
* commit '9dc211afbf3201a23a29cf7cd02ce575c6dbe094':
Detect and repair invalid layouts in the navigation bar.
2012-01-24 11:37:21 -08:00
Dianne Hackborn
0877ec44ac
am 47163685: Merge "Another attempt at issue #5823276 : home repaints after full-screen app is exited" into ics-mr1
...
* commit '47163685eb90f9520e7ae0ac0984b4e1535e8e5b':
Another attempt at issue #5823276 : home repaints after full-screen app is exited
2012-01-24 11:37:02 -08:00
Dianne Hackborn
a4a2df7f69
am c986d6f0: Merge "Fix issue #5906017 : Missing menu entries in portrait when in compatibility mode" into ics-mr1
...
* commit 'c986d6f01b00dd760ba1650918baadd24a6dc838':
Fix issue #5906017 : Missing menu entries in portrait when in compatibility mode
2012-01-24 11:34:49 -08:00
Daniel Sandler
9fb2e44d12
am a4474ae0: Merge "Detect and repair invalid layouts in the navigation bar." into ics-mr1
...
* commit 'a4474ae02546d725686f9c08113c16a84aca912c':
Detect and repair invalid layouts in the navigation bar.
2012-01-24 11:34:47 -08:00
Dianne Hackborn
8ee6be57f1
Merge "Another attempt at issue #5823276 : home repaints after full-screen app is exited" into ics-mr1
2012-01-24 11:33:15 -08:00
Dianne Hackborn
0545e6fcc8
Merge "Fix issue #5906017 : Missing menu entries in portrait when in compatibility mode" into ics-mr1
2012-01-24 11:33:06 -08:00
Daniel Sandler
244d1b2cad
Merge "Detect and repair invalid layouts in the navigation bar." into ics-mr1
2012-01-24 11:32:31 -08:00
Dianne Hackborn
efa9d3f848
Merge "Add new test for showing very slow animations."
2012-01-24 11:12:37 -08:00
Scott Main
3bd502442e
am e7dc2898: am 4809f09f: docs: update fujitsu id, capitalize
...
* commit 'e7dc2898c099bb1673f4bb0074b4d3b697699176':
docs: update fujitsu id, capitalize
2012-01-24 11:05:02 -08:00
Scott Main
6d0bc6e3dd
am b790d1aa: am cdf14454: docs: add fujitsu/toshiba USB vendor id
...
* commit 'b790d1aa2f741813b1556b71875dc453bc8c8010':
docs: add fujitsu/toshiba USB vendor id
2012-01-24 11:02:25 -08:00
Scott Main
67f1d5891e
am 4809f09f: docs: update fujitsu id, capitalize
...
* commit '4809f09f55a6177bd69303630dc42cc738f71116':
docs: update fujitsu id, capitalize
2012-01-24 11:01:49 -08:00
Scott Main
dac2f15d6a
am cdf14454: docs: add fujitsu/toshiba USB vendor id
...
* commit 'cdf14454326dcb2f43ae0da208a8ed65a38f2897':
docs: add fujitsu/toshiba USB vendor id
2012-01-24 10:59:23 -08:00
Gilles Debunne
9435129596
Merge "Fix for AOOB in MeasuredText"
2012-01-24 10:46:58 -08:00