Mathias Agopian
99bd43b2bb
am 4a46ee57: Merge "Improve the VSYNC api a bit."
...
* commit '4a46ee57f10f4a121776cfc05143aa580a92b5e5':
Improve the VSYNC api a bit.
2011-12-07 14:17:12 -08:00
Mathias Agopian
4a46ee57f1
Merge "Improve the VSYNC api a bit."
2011-12-07 14:15:21 -08:00
Dave Burke
4170420b3c
am 7554c57c: am 6727a43f: am 54a53841: Merge "Fetch at least 192KB to avoid our mp3 sniffer from blocking on data." into ics-mr1
...
* commit '7554c57c173352c0b3e9026b54fdda9fad101f8b':
Fetch at least 192KB to avoid our mp3 sniffer from blocking on data.
2011-12-07 14:13:46 -08:00
Dave Burke
7554c57c17
am 6727a43f: am 54a53841: Merge "Fetch at least 192KB to avoid our mp3 sniffer from blocking on data." into ics-mr1
...
* commit '6727a43f6d8ff193b86ca90b2daa761c47157638':
Fetch at least 192KB to avoid our mp3 sniffer from blocking on data.
2011-12-07 14:11:14 -08:00
Dave Burke
6727a43f6d
am 54a53841: Merge "Fetch at least 192KB to avoid our mp3 sniffer from blocking on data." into ics-mr1
...
* commit '54a53841a9ff48ba4cd004469ae4ff77caed900a':
Fetch at least 192KB to avoid our mp3 sniffer from blocking on data.
2011-12-07 14:08:13 -08:00
Dave Burke
54a53841a9
Merge "Fetch at least 192KB to avoid our mp3 sniffer from blocking on data." into ics-mr1
2011-12-07 14:05:41 -08:00
Robert Greenwalt
c9db51bb3b
am 131746ba: am e55e5b84: am 3957b5fc: Fix the build.
...
* commit '131746ba380c4c55b075e7aac00a395821526ccd':
Fix the build.
2011-12-07 13:21:45 -08:00
Robert Greenwalt
131746ba38
am e55e5b84: am 3957b5fc: Fix the build.
...
* commit 'e55e5b84e53889791c0b6be8cad7cc134c9dfcba':
Fix the build.
2011-12-07 13:19:37 -08:00
Robert Greenwalt
e55e5b84e5
am 3957b5fc: Fix the build.
...
* commit '3957b5fc49335f13b15080b8e7146580026c0479':
Fix the build.
2011-12-07 13:17:04 -08:00
Robert Greenwalt
3957b5fc49
Fix the build.
...
Change-Id: I71d1d9958182966d2eff0d34fa05ac57f2cabc48
2011-12-07 13:10:59 -08:00
Andreas Huber
7dea9aaff5
Fetch at least 192KB to avoid our mp3 sniffer from blocking on data.
...
Change-Id: Icb10c129249bb9b69e91f6633a385840c94efa59
related-to-bug: 5666532
2011-12-07 12:50:47 -08:00
Robert Greenwalt
edee57973c
am 86a94395: am 2ebd3612: am f352491a: Merge "Trim leading zeros from ipv4 addrs." into ics-mr1
...
* commit '86a943951b16b0da04ab64ef805d4a83da70a9b1':
Trim leading zeros from ipv4 addrs.
2011-12-07 12:36:04 -08:00
Robert Greenwalt
86a943951b
am 2ebd3612: am f352491a: Merge "Trim leading zeros from ipv4 addrs." into ics-mr1
...
* commit '2ebd3612d82f728873f87cdbea9fa5513b5cfb39':
Trim leading zeros from ipv4 addrs.
2011-12-07 12:33:24 -08:00
Robert Greenwalt
2ebd3612d8
am f352491a: Merge "Trim leading zeros from ipv4 addrs." into ics-mr1
...
* commit 'f352491aad71b5c0a30238707bdb83c9dc34fd9e':
Trim leading zeros from ipv4 addrs.
2011-12-07 12:31:11 -08:00
Robert Greenwalt
f352491aad
Merge "Trim leading zeros from ipv4 addrs." into ics-mr1
2011-12-07 12:29:14 -08:00
Irfan Sheriff
71d39ba177
am a6071c33: am 8c2122cb: am a85cc282: Merge "Fix CS wakelock handling" into ics-mr1
...
* commit 'a6071c338b0f46a47fe9c4bce87d4684e3c93dc7':
Fix CS wakelock handling
2011-12-07 12:13:00 -08:00
Irfan Sheriff
a6071c338b
am 8c2122cb: am a85cc282: Merge "Fix CS wakelock handling" into ics-mr1
...
* commit '8c2122cb3e347c607126c49d76fb165125a02295':
Fix CS wakelock handling
2011-12-07 12:10:58 -08:00
Irfan Sheriff
8c2122cb3e
am a85cc282: Merge "Fix CS wakelock handling" into ics-mr1
...
* commit 'a85cc28229c2d5114fcc83c3d7ebfd6894fd4b98':
Fix CS wakelock handling
2011-12-07 12:08:41 -08:00
Irfan Sheriff
a85cc28229
Merge "Fix CS wakelock handling" into ics-mr1
2011-12-07 12:06:31 -08:00
Bart Sears
06fefa9f99
am 63051d71: am 654ac45c: am b56076ac: Merge "Fix WebTextView rings" into ics-mr1
...
* commit '63051d71ef3da31c9764f6998e275adedbbcd9f5':
Fix WebTextView rings
2011-12-07 11:48:44 -08:00
Bart Sears
63051d71ef
am 654ac45c: am b56076ac: Merge "Fix WebTextView rings" into ics-mr1
...
* commit '654ac45c21b257613957c8c172a3fdff79903fcd':
Fix WebTextView rings
2011-12-07 11:46:11 -08:00
Bart Sears
654ac45c21
am b56076ac: Merge "Fix WebTextView rings" into ics-mr1
...
* commit 'b56076ac9f5ece5995363952e85d6dd8e4620e27':
Fix WebTextView rings
2011-12-07 11:43:54 -08:00
Bart Sears
b56076ac9f
Merge "Fix WebTextView rings" into ics-mr1
2011-12-07 11:41:57 -08:00
Joe Malin
a0221b0fa8
am 7c918ad4: am 3eebad61: am 3744d1fa: am 9e2cf49f: Merge "DOC CHANGE: Add Content URI ref doc" into ics-mr0
...
* commit '7c918ad493392ccb9cc24d3f2f35cab55916f582':
DOC CHANGE: Add Content URI ref doc
2011-12-07 11:34:39 -08:00
Joe Malin
7c918ad493
am 3eebad61: am 3744d1fa: am 9e2cf49f: Merge "DOC CHANGE: Add Content URI ref doc" into ics-mr0
...
* commit '3eebad61b4df7f5b4c898545aa7ec9076bc077d0':
DOC CHANGE: Add Content URI ref doc
2011-12-07 11:33:01 -08:00
Joe Malin
3eebad61b4
am 3744d1fa: am 9e2cf49f: Merge "DOC CHANGE: Add Content URI ref doc" into ics-mr0
...
* commit '3744d1faf582214132b9ba000d54cdbf44425113':
DOC CHANGE: Add Content URI ref doc
2011-12-07 11:30:41 -08:00
Joe Malin
3744d1faf5
am 9e2cf49f: Merge "DOC CHANGE: Add Content URI ref doc" into ics-mr0
...
* commit '9e2cf49fa360e70b33a870e9ae0b3eec11752972':
DOC CHANGE: Add Content URI ref doc
2011-12-07 11:28:25 -08:00
Irfan Sheriff
87f0a7b1aa
Fix CS wakelock handling
...
Change-Id: Ibe1c1ab3e26ff0ae7cab7bfb0bd868bfab246037
2011-12-07 11:28:21 -08:00
Joe Malin
9e2cf49fa3
Merge "DOC CHANGE: Add Content URI ref doc" into ics-mr0
2011-12-07 11:26:20 -08:00
Alex Sakhartchouk
4a8b4d7a55
am 7cee3183: Merge "Fixing file writing bug"
...
* commit '7cee31835de45eaff5922fc8647545d9bd30b567':
Fixing file writing bug
2011-12-07 11:09:59 -08:00
Alex Sakhartchouk
7cee31835d
Merge "Fixing file writing bug"
2011-12-07 11:07:42 -08:00
Alex Sakhartchouk
c08a1cc38f
Merge "Revert "Removing changes not meant for MR1"" into graphics-dev
2011-12-07 11:06:39 -08:00
Dianne Hackborn
9cade77ef0
am 138d870f: am 1f1fa7ed: am fb90df8c: Merge "Truthiness is good." into ics-mr1
...
* commit '138d870fb7b83bc2af54e87546abb883476298ff':
Truthiness is good.
2011-12-07 10:52:07 -08:00
Dianne Hackborn
138d870fb7
am 1f1fa7ed: am fb90df8c: Merge "Truthiness is good." into ics-mr1
...
* commit '1f1fa7edd608137863b863da44ee26efb5a93e23':
Truthiness is good.
2011-12-07 10:49:56 -08:00
Gilles Debunne
5ad18abbcb
am e6513486: Merge "Minor tweak in getLocationInWindow"
...
* commit 'e6513486ee83e3ce9e99ee3f08f470fc568f120f':
Minor tweak in getLocationInWindow
2011-12-07 10:42:14 -08:00
Gilles Debunne
e6513486ee
Merge "Minor tweak in getLocationInWindow"
2011-12-07 10:40:28 -08:00
Dianne Hackborn
1f1fa7edd6
am fb90df8c: Merge "Truthiness is good." into ics-mr1
...
* commit 'fb90df8c6e6d48c4b6701014a3053915b94f4b9e':
Truthiness is good.
2011-12-07 10:36:54 -08:00
Dianne Hackborn
fb90df8c6e
Merge "Truthiness is good." into ics-mr1
2011-12-07 10:33:19 -08:00
Robert Greenwalt
d4420ab2fb
Trim leading zeros from ipv4 addrs.
...
Underlying libraries will interpret leading zeros as octal values and
fail.
bug:5262995
Change-Id: Iff949225bb6b941f7274ee81754e1f41ed719a6c
2011-12-07 09:58:48 -08:00
The Android Open Source Project
4050b7a0a8
am 9cf8c86c: Reconcile with ics-mr1-release
...
* commit '9cf8c86c624b1e76c4adef8fa60f4d5db7abe4da':
2011-12-07 07:48:53 -08:00
The Android Open Source Project
9cf8c86c62
Reconcile with ics-mr1-release
...
Change-Id: Ie377d01065e1c34c60a97df3725e56100bae3903
2011-12-07 07:44:31 -08:00
The Android Open Source Project
f00f39d473
am 48747bdd: am 6ee7bca1: (-s ours) am 3de8d36b: Reconcile with ics-mr0-release
...
* commit '48747bdd5bb06ce4bdf8f9ac379e0c55a3ee2d6f':
DO NOT MERGE: Remove the AVI extractor.
Disable wifiwatchdog for now
2011-12-07 07:32:08 -08:00
The Android Open Source Project
48747bdd5b
am 6ee7bca1: (-s ours) am 3de8d36b: Reconcile with ics-mr0-release
...
* commit '6ee7bca1ce7f93d33a70701bb7862c3d13e68b89':
DO NOT MERGE: Remove the AVI extractor.
Disable wifiwatchdog for now
2011-12-07 07:29:38 -08:00
The Android Open Source Project
6ee7bca1ce
am 3de8d36b: Reconcile with ics-mr0-release
...
* commit '3de8d36b6fd166cf63ca256c455c0ea26a849668':
DO NOT MERGE: Remove the AVI extractor.
Disable wifiwatchdog for now
2011-12-07 07:27:57 -08:00
The Android Open Source Project
3de8d36b6f
Reconcile with ics-mr0-release
...
Change-Id: I5341d7d7de8ec8dfa86095e8d8d45a912bb01a47
2011-12-07 07:24:54 -08:00
Narayan Kamath
7830edef71
am b808af7d: Merge "Allow data uris to be data sources"
...
* commit 'b808af7daf74d27d3c745cd6d62007f344d37e53':
Allow data uris to be data sources
2011-12-07 04:18:16 -08:00
Narayan Kamath
b808af7daf
Merge "Allow data uris to be data sources"
2011-12-07 04:15:43 -08:00
Mathias Agopian
6779df2c28
Improve the VSYNC api a bit.
...
- add the ability to set the vsync delivery rate, when the rate is
set to N>1 (ie: receive every N vsync), SF process' is woken up for
all of vsync, but clients only see the every N events.
- add the concept of one-shot vsync events, with a call-back
to request the next one. currently the call-back is a binder IPC.
Change-Id: I09f71df0b0ba0d88ed997645e2e2497d553c9a1b
2011-12-06 22:43:10 -08:00
Irfan Sheriff
7086af8427
am bb60ee97: am 7c92e2dc: am 8a4cd3b1: Merge "Disable poor network connection alone" into ics-mr1
...
* commit 'bb60ee97664667c7774aa3c45b473332a3757d21':
Disable poor network connection alone
2011-12-06 21:12:06 -08:00
Irfan Sheriff
bb60ee9766
am 7c92e2dc: am 8a4cd3b1: Merge "Disable poor network connection alone" into ics-mr1
...
* commit '7c92e2dccb4e5cb5314455692ac32d2ccff24292':
Disable poor network connection alone
2011-12-06 21:09:44 -08:00