Mathias Agopian
d0566bc26f
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
Mathias Agopian
439cf8576d
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
Eric Fischer
4a0994e4ab
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
46b547efd8
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
8219e9122e
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
0c06ad7ee1
Merge "Import revised translations. DO NOT MERGE" into ics-mr1
2011-11-29 11:44:59 -08:00
Mathias Agopian
461afeb9fd
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
3ad3807a5c
BitTube::read now handles EAGAIN
...
Change-Id: Iacda2386342ba0727bbf278f6c597488d5467bb8
2011-11-29 11:42:59 -08:00
Mathias Agopian
4c810740e7
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
4c2384c26f
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
623f5d61b9
Merge "temporarily hardcode Nexus S refresh rate" into ics-mr1
2011-11-29 11:35:07 -08:00
Eric Fischer
2bc359aafc
Merge "Import revised translations."
2011-11-29 11:09:51 -08:00
Dianne Hackborn
8f74c9980c
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
89369172f7
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
8f0995738b
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
3455cba607
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
2866f4ad68
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
bb03013a63
Merge "Restoring mLayout has private in TextView"
2011-11-29 10:09:25 -08:00
Jaikumar Ganesh
395567a9d4
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
a2a0b7a053
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
da1053de0d
Merge "Cleanup references when turning BT off." into ics-mr1
2011-11-29 10:05:27 -08:00
Jaikumar Ganesh
8d9b517bd0
Merge "Cleanup static references when quitting." into ics-mr1
2011-11-29 10:05:13 -08:00
Gilles Debunne
e1d823147e
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
acae657cb5
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
f0ec6fbcbc
am 10232fe6: Merge "Extracted text problems" into ics-mr1
...
* commit '10232fe63916d03d147d0a07f8bf4d70cb60941c':
Extracted text problems
2011-11-29 10:01:35 -08:00
Gilles Debunne
736fa13542
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
87b0b8c84c
Merge "Extracted text problems" into ics-mr1
2011-11-29 09:59:00 -08:00
Gilles Debunne
919cb05045
Merge "IOOB in text selection." into ics-mr1
2011-11-29 09:56:58 -08:00
Daniel Sandler
5d0b591ae6
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
c6f48c6842
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
a6e18fc3de
Merge "Quick fix for bug 5646217 blocking automation tests" into ics-mr1
2011-11-29 05:49:11 -08:00
Yu Shan Emily Lau
073bbccba7
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
ef56d02fe9
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
907e5e7c09
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
Christopher Tate
32766d965a
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
b4b54368c3
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
203e95eef8
Merge "Add iteration-limited mode to FrameworkPerf" into ics-mr1
2011-11-28 17:56:18 -08:00
Xia Wang
84de887732
am 4f5434f3: am e5715521: am 2d9f4620: Fix build
...
* commit '4f5434f3a3ce51d7d6caf463e5571bb686e2bdd1':
Fix build
2011-11-28 16:59:20 -08:00
Dianne Hackborn
37e197943e
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
Xia Wang
5ee38d25d7
am e5715521: am 2d9f4620: Fix build
...
* commit 'e5715521232443f01f8c0c0633cac364c8136bde':
Fix build
2011-11-28 16:57:14 -08:00
Dianne Hackborn
bfdb7b36bd
am b54980d1: Merge "Fix issue #5588689 : Black camera preview after coming back from gmail" into ics-mr1
...
* commit 'b54980d1d4d903f68cdfa952256afff01902cd94':
Fix issue #5588689 : Black camera preview after coming back from gmail
2011-11-28 16:55:05 -08:00
Xia Wang
efba5b5674
am 2d9f4620: Fix build
...
* commit '2d9f4620625405b916aa27177a6b5f82f8e5b15d':
Fix build
2011-11-28 16:53:50 -08:00
Dianne Hackborn
7aa0d8fb3d
Merge "Fix issue #5588689 : Black camera preview after coming back from gmail" into ics-mr1
2011-11-28 16:53:00 -08:00
Romain Guy
0cdeb5428e
am 02e88f23: am 46685db9: Merge "Fix crash in existing applications Bug #5659476 " into ics-mr1
...
* commit '02e88f23a65c602e83d7a46c0925e653b948e418':
Fix crash in existing applications Bug #5659476
2011-11-28 16:11:27 -08:00
Romain Guy
7a6b56de94
am 46685db9: Merge "Fix crash in existing applications Bug #5659476 " into ics-mr1
...
* commit '46685db957cc01cef4ba198aafe44d99fe31f62c':
Fix crash in existing applications Bug #5659476
2011-11-28 16:08:52 -08:00
Xia Wang
6b2a47a000
am 6c509ef0: am da822367: am 25261f59: Merge "Increase time between wifi stop and wifi start: set to 2 minutes http://b/issue?id=5629901 " into ics-mr0
...
* commit '6c509ef0bad761feecfd94b66d532ae05b450317':
Increase time between wifi stop and wifi start: set to 2 minutes http://b/issue?id=5629901
2011-11-28 16:07:13 -08:00
Romain Guy
30d5c55ee7
Merge "Fix crash in existing applications Bug #5659476 " into ics-mr1
2011-11-28 16:06:52 -08:00
Xia Wang
7f800e1f7a
am da822367: am 25261f59: Merge "Increase time between wifi stop and wifi start: set to 2 minutes http://b/issue?id=5629901 " into ics-mr0
...
* commit 'da822367886d68f997153c7edd5368f3dfb6d58d':
Increase time between wifi stop and wifi start: set to 2 minutes http://b/issue?id=5629901
2011-11-28 16:04:39 -08:00
Xia Wang
5c71c805c5
am 25261f59: Merge "Increase time between wifi stop and wifi start: set to 2 minutes http://b/issue?id=5629901 " into ics-mr0
...
* commit '25261f59af0d902f239e541b735f7dc31e714b07':
Increase time between wifi stop and wifi start: set to 2 minutes http://b/issue?id=5629901
2011-11-28 16:02:44 -08:00
Xia Wang
0969e94791
Merge "Increase time between wifi stop and wifi start: set to 2 minutes http://b/issue?id=5629901 " into ics-mr0
2011-11-28 16:00:49 -08:00