Dianne Hackborn
97e2bcd760
Rewrite battery history storage.
...
We now write battery history directly into a buffer, instead of
creating objects. This allows for more efficient storage; later
it can be even better because we can only write deltas.
The old code is still there temporarily for validation.
Change-Id: I9707d4d8ff30855be8ebdc93bc078911040d8e0b
2011-04-14 10:57:22 -07:00
Xia Wang
4849bc5b3d
am a4b76ff4: am d69ec89f: am 46b59ef0: Merge "Fix access point parsing: reset static link property after parsing static ip setting Fix removeConfiguredNetwork: add sleep between remove configured network and disable wifi" into honeycomb-mr1
...
* commit 'a4b76ff4911538f01e92af2f3fa3f4016ad0e290':
Fix access point parsing: reset static link property after parsing static ip setting Fix removeConfiguredNetwork: add sleep between remove configured network and disable wifi
2011-04-13 16:05:07 -07:00
Xia Wang
001edca47a
am d69ec89f: am 46b59ef0: Merge "Fix access point parsing: reset static link property after parsing static ip setting Fix removeConfiguredNetwork: add sleep between remove configured network and disable wifi" into honeycomb-mr1
...
* commit 'd69ec89f5d31064174d79e2e77504814629cffa6':
Fix access point parsing: reset static link property after parsing static ip setting Fix removeConfiguredNetwork: add sleep between remove configured network and disable wifi
2011-04-13 15:52:39 -07:00
Gloria Wang
4a6f0f2427
Merge "- Add another parameter in notify() to be able to send timed text sample through listener during video playback. - Add OnTimedTextListener in the MediaPlayer For feature request 800939."
2011-04-13 15:36:14 -07:00
Xia Wang
203f649656
am 46b59ef0: Merge "Fix access point parsing: reset static link property after parsing static ip setting Fix removeConfiguredNetwork: add sleep between remove configured network and disable wifi" into honeycomb-mr1
...
* commit '46b59ef01be530a6bbe3f0e9a2bed27de9985f40':
Fix access point parsing: reset static link property after parsing static ip setting Fix removeConfiguredNetwork: add sleep between remove configured network and disable wifi
2011-04-13 15:34:29 -07:00
Xia Wang
aef161d454
Merge "Fix access point parsing: reset static link property after parsing static ip setting Fix removeConfiguredNetwork: add sleep between remove configured network and disable wifi" into honeycomb-mr1
2011-04-13 15:13:10 -07:00
Glenn Kasten
892defdd55
am 8d2e14da: am 34cd123a: am b0d6f10e: Bug 4167061 remove debugging code
...
* commit '8d2e14daa752d657b9747fc9734fbfd7b34c1f7a':
Bug 4167061 remove debugging code
2011-04-13 11:56:41 -07:00
Glenn Kasten
fbdf138926
am 34cd123a: am b0d6f10e: Bug 4167061 remove debugging code
...
* commit '34cd123a2ee1aa9d13d7eb9ee9c9dd5a1cea50a4':
Bug 4167061 remove debugging code
2011-04-13 11:52:32 -07:00
Glenn Kasten
ce5c08c2e4
am b0d6f10e: Bug 4167061 remove debugging code
...
* commit 'b0d6f10eedeef099164995d51dbd076a6fcc5acc':
Bug 4167061 remove debugging code
2011-04-13 11:48:28 -07:00
Steve Block
03b3ac9683
Merge "Fix a typo in FrameLayout JavaDoc"
2011-04-13 11:10:17 -07:00
Elliott Hughes
3ce7d3a6cf
Merge "More native code cleanup."
2011-04-13 11:09:57 -07:00
Elliott Hughes
36df426dbc
Merge "Use an @hide libcore API to get the FileDescriptor from a Socket."
2011-04-13 10:18:03 -07:00
Elliott Hughes
fd272c251c
Merge "Don't allocate a raw object then call its constructor manually..."
2011-04-13 10:17:46 -07:00
Wu-cheng Li
89675f7611
Merge "Add camera metering area API."
2011-04-13 01:14:42 -07:00
Wink Saville
21d7782cb3
am 05be003f: am c078a436: Merge "Fix occasional phone app crash" into honeycomb-LTE
...
* commit '05be003f7f3dd758c44c2cdb3e7aa638d8daa446':
Fix occasional phone app crash
2011-04-12 17:03:29 -07:00
Wink Saville
71d21b7efb
am c078a436: Merge "Fix occasional phone app crash" into honeycomb-LTE
...
* commit 'c078a4362791cec3976c4312d3f7e0e96b3487bf':
Fix occasional phone app crash
2011-04-12 17:00:57 -07:00
Wink Saville
36fb943450
Merge "Fix occasional phone app crash" into honeycomb-LTE
2011-04-12 16:53:54 -07:00
Elliott Hughes
5ac1fcab91
Merge "Remove useless forward declarations."
2011-04-12 16:29:49 -07:00
Kenny Root
029b92251a
Merge "Updated system packages retain shared user"
2011-04-12 15:34:42 -07:00
Scott Main
8f745c9c8e
am bf3452f3: am 34b42b2d: am 7e8902a9: am f42937a8: docs: fix doc typo
...
* commit 'bf3452f36c768808873e5428e3594c7eaec0a10c':
docs: fix doc typo
2011-04-12 14:55:32 -07:00
Scott Main
e69ed721c9
am 34b42b2d: am 7e8902a9: am f42937a8: docs: fix doc typo
...
* commit '34b42b2ded4741e68413d0aa39f3af146629dcec':
docs: fix doc typo
2011-04-12 14:52:30 -07:00
Scott Main
c2b8995c9a
am 7e8902a9: am f42937a8: docs: fix doc typo
...
* commit '7e8902a90566bf05c9bc12f87f4149fc6e3c00a4':
docs: fix doc typo
2011-04-12 14:48:30 -07:00
Scott Main
281c94f89d
am f42937a8: docs: fix doc typo
...
* commit 'f42937a8aa0af6b22d8a2a43a9bfc07c38aeffb5':
docs: fix doc typo
2011-04-12 14:44:02 -07:00
Eric Fischer
ff4c71e7d5
am 70cf1b97: (-s ours) am 68cb0ffa: (-s ours) am 71a556f2: Import revised translations. DO NOT MERGE
...
* commit '70cf1b97586a4f1ffa04fe0d83c3590fc22f6a56':
Import revised translations. DO NOT MERGE
2011-04-12 13:28:14 -07:00
Scott Main
51f58bf44a
am 6ce11bb0: am 91470be4: am c7b94371: am b9fedd97: docs: fix broken links
...
* commit '6ce11bb0e1d8e0366f4321f90826d60ee1e52193':
docs: fix broken links
2011-04-12 13:27:43 -07:00
Bill Gruber
1b148ab903
am e3aa4ec6: am a8c68be8: am df8fc2e1: am 9a693ed9: Doc fix-corrects the cited download locations
...
* commit 'e3aa4ec6b1c0d1e732fb686c0d8adc7d729b6fc6':
Doc fix-corrects the cited download locations
2011-04-12 13:27:38 -07:00
Eric Fischer
17230ed6b1
am 68cb0ffa: (-s ours) am 71a556f2: Import revised translations. DO NOT MERGE
...
* commit '68cb0ffad05323dc1df7faeefa8f41586744c293':
Import revised translations. DO NOT MERGE
2011-04-12 13:18:52 -07:00
Scott Main
efeed54cb5
am 91470be4: am c7b94371: am b9fedd97: docs: fix broken links
...
* commit '91470be46644493be89dc277f3c0f987f34bc937':
docs: fix broken links
2011-04-12 13:08:50 -07:00
Scott Main
372f5c0ed2
am c7b94371: am b9fedd97: docs: fix broken links
...
* commit 'c7b94371a0a4cbe853c17c4610a564a5a4d3efd5':
docs: fix broken links
2011-04-12 13:06:50 -07:00
Scott Main
6b923ae419
am b9fedd97: docs: fix broken links
...
* commit 'b9fedd9771a6aedf068155fd91f15baf52e668cd':
docs: fix broken links
2011-04-12 13:02:43 -07:00
Eric Fischer
b7b75cbe6d
am 71a556f2: Import revised translations. DO NOT MERGE
...
* commit '71a556f24e2b8d489bf81b22fab6fe5e99a9eae0':
Import revised translations. DO NOT MERGE
2011-04-12 13:02:15 -07:00
Kenny Root
81bc567745
resolved conflicts for merge of 18490fb9 to master
...
Change-Id: I6c68e6fb0f9c1182a955689bbffc161a8f30bd37
2011-04-12 12:51:08 -07:00
Bill Gruber
a3a19c84bc
am a8c68be8: am df8fc2e1: am 9a693ed9: Doc fix-corrects the cited download locations
...
* commit 'a8c68be89d3735e5d579e521d0798032303330d3':
Doc fix-corrects the cited download locations
2011-04-12 12:42:26 -07:00
Bill Gruber
46fe2b098d
am df8fc2e1: am 9a693ed9: Doc fix-corrects the cited download locations
...
* commit 'df8fc2e1bfb6abcbea107636f36fae464faf976f':
Doc fix-corrects the cited download locations
2011-04-12 12:23:33 -07:00
Elliott Hughes
d80cc88854
Merge "More native code cleanup."
2011-04-12 12:09:01 -07:00
Andy McFadden
32cd0784a7
Merge "Fix typos."
2011-04-12 12:02:36 -07:00
Bill Gruber
af40f2d47d
am 9a693ed9: Doc fix-corrects the cited download locations
...
* commit '9a693ed9870cf2d5817a3bfc8dc0fbec4456a3c2':
Doc fix-corrects the cited download locations
2011-04-12 11:48:00 -07:00
Doug Zongker
0da4f3c965
Merge "protect all /cache/recovery/last_* files from deletion"
2011-04-12 11:30:47 -07:00
Kenny Root
f6bbefd581
resolved conflicts for merge of 87b3c0dc to honeycomb-plus-aosp
...
Change-Id: Ia1a0024aabf531438203eb9fea3a10dd15eabe53
2011-04-12 10:27:15 -07:00
Elliott Hughes
d61378ffbf
Merge "Kill the global references in the OpenGL wrappers."
2011-04-12 10:19:11 -07:00
Andreas Huber
09a75f337b
Merge "Experimental support for changing the video surface/texture on an active mediaplayer"
2011-04-12 09:25:32 -07:00
Andreas Huber
c275555ed3
Merge "If the media extractor specifies an invalid thumbnail time, default to the first frame."
2011-04-12 08:36:59 -07:00
Benoit Goby
d810610fe1
am 0b9b8711: am 43be7a61: EthernetDataTracker: implement setDependencyMet
...
* commit '0b9b8711a1a2107dc913cc751b7d981fce4f3082':
EthernetDataTracker: implement setDependencyMet
2011-04-11 20:26:41 -07:00
Benoit Goby
77e4ad4610
am 43be7a61: EthernetDataTracker: implement setDependencyMet
...
* commit '43be7a6120d9dd2ee0902de2322aec2ee75b0351':
EthernetDataTracker: implement setDependencyMet
2011-04-11 20:23:42 -07:00
Benoit Goby
9034a564a1
resolved conflicts for merge of 31659471 to master
...
Change-Id: Ib49a1ef39455af8b01c3feb7fcb5393e0a4ceec9
2011-04-11 19:07:11 -07:00
Benoit Goby
f3a0fcc94b
am 2869d171: resolved conflicts for merge of 08c39c6a to honeycomb-LTE
...
* commit '2869d1715d815ef2b357bf182d384515cdf6f9ab':
Add support for USB Ethernet adapters
2011-04-11 18:53:57 -07:00
Benoit Goby
29d013afa9
resolved conflicts for merge of 08c39c6a to honeycomb-LTE
...
Change-Id: I79f8ac1dc8ff9f5d0559d37043b850cd26246b92
2011-04-11 18:41:23 -07:00
Brad Fitzpatrick
904771fc14
am 07c25b65: am 4430670f: am ca7ad44a: Merge "audioflinger: Enable ARMv5TE optimized resampler"
...
* commit '07c25b651216daac884bd503c02b788418165b50':
audioflinger: Enable ARMv5TE optimized resampler
2011-04-11 17:32:37 -07:00
Xavier Ducrohet
e277418b1d
am 1f2a307b: resolved conflicts for merge of 4754c79a to honeycomb-plus-aosp
...
* commit '1f2a307b59a6f1d61390425b52c3f0aafc21c54b':
LayoutLib: don't render when shader's local matrix is set to 0 scale.
2011-04-11 17:28:59 -07:00
Elliott Hughes
ca24574eec
Merge "You don't need to poke around inside FileDescriptor manually."
2011-04-11 17:27:53 -07:00