Mathias Agopian
8e6115f622
Merge "Add support for sending VSYNC events to the framework"
2011-11-29 13:12:32 -08:00
Dianne Hackborn
123ad2823b
am 3788ce9e: am 50b20425: Merge "Another attempt at getting OOM reports to batch." into ics-mr1
...
* commit '3788ce9ed9b896c2f1d5500910e949a6eba308e2':
Another attempt at getting OOM reports to batch.
2011-11-29 13:11:12 -08:00
Mathias Agopian
79f39eb460
Add support for sending VSYNC events to the framework
...
use gui/DisplayEvent to receive the events. Events are
dispatched through a unix pipe, so the API is compatible
with utils/Looper. see gui/DisplayEvent.h for more info.
Bug: 1475048
Change-Id: Ia720f64d1b950328b47b22c6a86042e481d35f09
2011-11-29 13:10:25 -08:00
Dianne Hackborn
3788ce9ed9
am 50b20425: Merge "Another attempt at getting OOM reports to batch." into ics-mr1
...
* commit '50b2042502bc459b40430fe3b3b83d7d61e5daf9':
Another attempt at getting OOM reports to batch.
2011-11-29 13:09:03 -08:00
Mathias Agopian
f9e88fbee0
Fix build.
...
Revert "Add support for sending VSYNC events to the framework"
This reverts commit f3918c5bd4bc9f02f74da42995564150ca2dd382.
Change-Id: I998e3e1aa3fa310829ae973b64fe11b01f6f468f
2011-11-29 13:07:40 -08:00
Dianne Hackborn
50b2042502
Merge "Another attempt at getting OOM reports to batch." into ics-mr1
2011-11-29 13:05:26 -08:00
Dianne Hackborn
672342c309
Another attempt at getting OOM reports to batch.
...
We now generate a stack-trace looking thing at the top of the report.
Also fix a bug I hit where the phone window manager was sending a
broadcast before the boot had completed.
Change-Id: I0cee16180e4d05c9bd3fe715212a28f504ec91ac
2011-11-29 12:55:50 -08:00
Eric Fischer
e11ec1df42
am 47af771d: (-s ours) am 9ab3c624: Merge "Import revised translations. DO NOT MERGE" into ics-mr1
...
* commit '47af771d708c8eb8f7debf7e295d609491f03cc8':
Import revised translations. DO NOT MERGE
2011-11-29 11:51:20 -08:00
Eric Fischer
47af771d70
am 9ab3c624: Merge "Import revised translations. DO NOT MERGE" into ics-mr1
...
* commit '9ab3c62499c054b600699fb107c28fc8926ca5a1':
Import revised translations. DO NOT MERGE
2011-11-29 11:47:08 -08:00
Mathias Agopian
aa2892edc7
Merge changes If4126023,Iacda2386,I1eb691f7,Ib56139f8
...
* changes:
Add support for sending VSYNC events to the framework
BitTube::read now handles EAGAIN
split ComposerService out of SurfaceComposerClient.h
rewrite SF's message loop on top of Looper
2011-11-29 11:47:03 -08:00
Eric Fischer
9ab3c62499
Merge "Import revised translations. DO NOT MERGE" into ics-mr1
2011-11-29 11:44:59 -08:00
Mathias Agopian
f3918c5bd4
Add support for sending VSYNC events to the framework
...
use gui/DisplayEvent to receive the events. Events are
dispatched through a unix pipe, so the API is compatible
with utils/Looper. see gui/DisplayEvent.h for more info.
Bug: 1475048
Change-Id: If4126023fc9c067e56087ec7d16a8fd542ce1794
2011-11-29 11:44:05 -08:00
Mathias Agopian
bb9ba8bae5
BitTube::read now handles EAGAIN
...
Change-Id: Iacda2386342ba0727bbf278f6c597488d5467bb8
2011-11-29 11:42:59 -08:00
Eric Fischer
fa56c714f2
Import revised translations. DO NOT MERGE
...
Change-Id: Ia50fd44ea4492188f481e652caae940acaf961e2
2011-11-29 11:42:53 -08:00
Mathias Agopian
1e773932a1
am db0bc7d4: am 3f2730c5: Merge "temporarily hardcode Nexus S refresh rate" into ics-mr1
...
* commit 'db0bc7d46cacb6446deb7c59d39ce563846d7071':
temporarily hardcode Nexus S refresh rate
2011-11-29 11:39:49 -08:00
Mathias Agopian
db0bc7d46c
am 3f2730c5: Merge "temporarily hardcode Nexus S refresh rate" into ics-mr1
...
* commit '3f2730c5317700e3ae5412b5c825a747b591ebc2':
temporarily hardcode Nexus S refresh rate
2011-11-29 11:36:54 -08:00
Mathias Agopian
3f2730c531
Merge "temporarily hardcode Nexus S refresh rate" into ics-mr1
2011-11-29 11:35:07 -08:00
Eric Fischer
9b4268697f
Merge "Import revised translations."
2011-11-29 11:09:51 -08:00
Eric Fischer
4a97ebfec5
Import revised translations.
...
Change-Id: Ie43246df49b8f6ef3daef12e0d8fb5c2f573874e
2011-11-29 10:29:25 -08:00
Dianne Hackborn
45c62be2bc
am e2d76314: am 9b518d93: Merge "Fix issue #5642121 : Proximity sensor didn\'t turn the screen on in call" into ics-mr1
...
* commit 'e2d76314cdd64cc69c791af0ee2fd2bbcc0425ba':
Fix issue #5642121 : Proximity sensor didn't turn the screen on in call
2011-11-29 10:20:03 -08:00
Dianne Hackborn
e2d76314cd
am 9b518d93: Merge "Fix issue #5642121 : Proximity sensor didn\'t turn the screen on in call" into ics-mr1
...
* commit '9b518d9304eb4ad17591944926231b661a3dfce0':
Fix issue #5642121 : Proximity sensor didn't turn the screen on in call
2011-11-29 10:17:42 -08:00
Dianne Hackborn
9b518d9304
Merge "Fix issue #5642121 : Proximity sensor didn't turn the screen on in call" into ics-mr1
2011-11-29 10:16:11 -08:00
Jaikumar Ganesh
f96ccc175d
am f4e41c35: am eb701df8: Merge "Cleanup references when turning BT off." into ics-mr1
...
* commit 'f4e41c35387728720780935564a491cf9bf1357e':
Cleanup references when turning BT off.
2011-11-29 10:09:40 -08:00
Jaikumar Ganesh
9ab5ef2741
am 910ae39f: am ff33b94e: Merge "Cleanup static references when quitting." into ics-mr1
...
* commit '910ae39f8a12bcb917b7eb1da3f701925da79509':
Cleanup static references when quitting.
2011-11-29 10:09:38 -08:00
Gilles Debunne
c273cd318d
Merge "Restoring mLayout has private in TextView"
2011-11-29 10:09:25 -08:00
Jaikumar Ganesh
f4e41c3538
am eb701df8: Merge "Cleanup references when turning BT off." into ics-mr1
...
* commit 'eb701df88cb3027d6323f9e2607cbe4d5ca93ac2':
Cleanup references when turning BT off.
2011-11-29 10:07:09 -08:00
Jaikumar Ganesh
910ae39f8a
am ff33b94e: Merge "Cleanup static references when quitting." into ics-mr1
...
* commit 'ff33b94e236fcde3833fba698d32d0e6b98fa303':
Cleanup static references when quitting.
2011-11-29 10:07:07 -08:00
Jaikumar Ganesh
eb701df88c
Merge "Cleanup references when turning BT off." into ics-mr1
2011-11-29 10:05:27 -08:00
Jaikumar Ganesh
ff33b94e23
Merge "Cleanup static references when quitting." into ics-mr1
2011-11-29 10:05:13 -08:00
Gilles Debunne
e29e4d2ade
am 9d8d5297: am 10232fe6: Merge "Extracted text problems" into ics-mr1
...
* commit '9d8d529739b1b9790599364f57cffbe022d15ee2':
Extracted text problems
2011-11-29 10:04:01 -08:00
Gilles Debunne
6c9d4f3cd3
am 0dca407e: am 7be31bd9: Merge "IOOB in text selection." into ics-mr1
...
* commit '0dca407eede3d85a0185718f4993c2b09d1cc658':
IOOB in text selection.
2011-11-29 10:01:43 -08:00
Gilles Debunne
9d8d529739
am 10232fe6: Merge "Extracted text problems" into ics-mr1
...
* commit '10232fe63916d03d147d0a07f8bf4d70cb60941c':
Extracted text problems
2011-11-29 10:01:35 -08:00
Gilles Debunne
0dca407eed
am 7be31bd9: Merge "IOOB in text selection." into ics-mr1
...
* commit '7be31bd96a4cc71ebc2539573f062fa53cc7cb05':
IOOB in text selection.
2011-11-29 09:59:25 -08:00
Gilles Debunne
10232fe639
Merge "Extracted text problems" into ics-mr1
2011-11-29 09:59:00 -08:00
Gilles Debunne
7be31bd96a
Merge "IOOB in text selection." into ics-mr1
2011-11-29 09:56:58 -08:00
Daniel Sandler
0e9c942e4a
am 834c2870: am fed7a99a: Merge "Quick fix for bug 5646217 blocking automation tests" into ics-mr1
...
* commit '834c2870fa422098b3728ae26099b3030994f86f':
Quick fix for bug 5646217 blocking automation tests
2011-11-29 05:54:09 -08:00
Daniel Sandler
834c2870fa
am fed7a99a: Merge "Quick fix for bug 5646217 blocking automation tests" into ics-mr1
...
* commit 'fed7a99a5294856d930e18225898828bd6755be1':
Quick fix for bug 5646217 blocking automation tests
2011-11-29 05:51:18 -08:00
Daniel Sandler
fed7a99a52
Merge "Quick fix for bug 5646217 blocking automation tests" into ics-mr1
2011-11-29 05:49:11 -08:00
Yu Shan Emily Lau
9a8246c8d1
am 77d1ebbd: am 4e5d3f2c: Merge "Add the min fps option to set the min fps in the media recorder test. Add the procmem log to the media memory stress test." into ics-mr1
...
* commit '77d1ebbd7bd42d849911e680a63eec02e8b444db':
Add the min fps option to set the min fps in the media recorder test. Add the procmem log to the media memory stress test.
2011-11-28 19:57:26 -08:00
Yu Shan Emily Lau
77d1ebbd7b
am 4e5d3f2c: Merge "Add the min fps option to set the min fps in the media recorder test. Add the procmem log to the media memory stress test." into ics-mr1
...
* commit '4e5d3f2ca05b513640d3163155756e01ae577d54':
Add the min fps option to set the min fps in the media recorder test. Add the procmem log to the media memory stress test.
2011-11-28 19:55:27 -08:00
Yu Shan Emily Lau
4e5d3f2ca0
Merge "Add the min fps option to set the min fps in the media recorder test. Add the procmem log to the media memory stress test." into ics-mr1
2011-11-28 19:53:58 -08:00
Gilles Debunne
cdfab19bf7
Restoring mLayout has private in TextView
...
Change-Id: If8c4385ec0b64fb2055f4561aeeb1c145294d679
2011-11-28 18:05:03 -08:00
Christopher Tate
2f9e260185
am 6d7bd049: am 05160615: Merge "Add iteration-limited mode to FrameworkPerf" into ics-mr1
...
* commit '6d7bd049b02cd24429e540b764c44c8371b7d5eb':
Add iteration-limited mode to FrameworkPerf
2011-11-28 18:00:36 -08:00
Christopher Tate
6d7bd049b0
am 05160615: Merge "Add iteration-limited mode to FrameworkPerf" into ics-mr1
...
* commit '051606150a80efa71b139e9d52fe6c8b2c02c884':
Add iteration-limited mode to FrameworkPerf
2011-11-28 17:58:25 -08:00
Christopher Tate
051606150a
Merge "Add iteration-limited mode to FrameworkPerf" into ics-mr1
2011-11-28 17:56:18 -08:00
Yu Shan Emily Lau
99b4523b75
Add the min fps option to set
...
the min fps in the media recorder test.
Add the procmem log to the media
memory stress test.
Change-Id: Icf82f12adeca7072a171991d1d6a994e4bb7764a
2011-11-28 17:56:02 -08:00
Christopher Tate
80a682bc3d
Add iteration-limited mode to FrameworkPerf
...
You can run tests for exactly N iterations regardless of duration now,
in addition to the previous time-limited behavior.
(Clean cherry-pick to break a dependency on a previous patch that
needs work before being committed.)
Change-Id: I2e6cf511bbe968a6f95391567658722e87dfa1fe
2011-11-28 17:48:55 -08:00
Xia Wang
462a9da4c3
am 4f5434f3: am e5715521: am 2d9f4620: Fix build
...
* commit '4f5434f3a3ce51d7d6caf463e5571bb686e2bdd1':
Fix build
2011-11-28 16:59:20 -08:00
Dianne Hackborn
81de8b99f5
Fix issue #5642121 : Proximity sensor didn't turn the screen on in call
...
Turning animations back on exposed this. The problem is that when the
screen brightness changes, it initiates a brightness animation. When
we force the screen to black as we wait for it to be ready to display,
it sees that an animation is running so stops it and thinks this means
it should now turn the display off.
To fix this, don't modify the screen brightness while we are waiting
to show the screen. This is good anyway because the whole point is to
avoid showing the screen until ready, and modifying the brightness at
that point would turn it on prematurely.
Change-Id: I84b296f8ca5705c2d237ea7741cdeb95c5521df9
2011-11-28 16:57:37 -08:00
Dianne Hackborn
c0b7f65ae0
am 496f6e2a: am b54980d1: Merge "Fix issue #5588689 : Black camera preview after coming back from gmail" into ics-mr1
...
* commit '496f6e2ad656c5bb8a277e191554d16abd290b58':
Fix issue #5588689 : Black camera preview after coming back from gmail
2011-11-28 16:57:17 -08:00