Justin Ho
086a733cde
am 4b1c8389: am 8a445fc3: Merge "Integrating drawable-xlarge stat_sys assets" into honeycomb
...
* commit '4b1c838959b27b14209f8f446f95630232b93cef':
Integrating drawable-xlarge stat_sys assets
2011-01-26 13:05:38 -08:00
Justin Ho
8fa2997edc
am 8a445fc3: Merge "Integrating drawable-xlarge stat_sys assets" into honeycomb
...
* commit '8a445fc30e45c1f7a9805ae19948ec32786458a0':
Integrating drawable-xlarge stat_sys assets
2011-01-26 13:04:18 -08:00
Justin Ho
362d419c91
Merge "Integrating drawable-xlarge stat_sys assets" into honeycomb
2011-01-26 13:02:01 -08:00
Daniel Sandler
cece4b3cda
am 26d7aea7: am 044602b2: Merge "Ticker visual fixes." into honeycomb
...
* commit '26d7aea7b7bd4439cf85ea0a2d2d58b05a0f4642':
Ticker visual fixes.
2011-01-26 12:55:16 -08:00
Daniel Sandler
96701f6c2e
am 044602b2: Merge "Ticker visual fixes." into honeycomb
...
* commit '044602b226638e92907fbd573723772856256259':
Ticker visual fixes.
2011-01-26 12:53:58 -08:00
Dharmaray Kundargi
aaa0dee53b
am 666b9eb3: am 45e3d123: Merge "Overlay java files Issue 3370836" into honeycomb
...
* commit '666b9eb3a260034c85e2a6eaa5e8f4ceea968f33':
Overlay java files Issue 3370836
2011-01-26 12:52:05 -08:00
Dharmaray Kundargi
e9ec4ea8e8
am 81bebad0: am ecebf173: Merge "Fix for Issue 3370836 : JNI files for Overlay optmization." into honeycomb
...
* commit '81bebad0f1fa0bda5a74e4e78b43bd94bd94bf40':
Fix for Issue 3370836 : JNI files for Overlay optmization.
2011-01-26 12:51:58 -08:00
Daniel Sandler
5d87d2e82d
Merge "Ticker visual fixes." into honeycomb
2011-01-26 12:51:30 -08:00
Dharmaray Kundargi
706fff9241
am 45e3d123: Merge "Overlay java files Issue 3370836" into honeycomb
...
* commit '45e3d123bce32a8b1f469d366ebb1d3f9ccb2bfc':
Overlay java files Issue 3370836
2011-01-26 12:48:32 -08:00
Dharmaray Kundargi
65e516ed11
am ecebf173: Merge "Fix for Issue 3370836 : JNI files for Overlay optmization." into honeycomb
...
* commit 'ecebf173deca568aa44f4fc29968e10c78ad7571':
Fix for Issue 3370836 : JNI files for Overlay optmization.
2011-01-26 12:48:28 -08:00
Dharmaray Kundargi
7cd73018d3
Merge "Overlay java files Issue 3370836" into honeycomb
2011-01-26 12:46:23 -08:00
Dharmaray Kundargi
6bd4df9265
Merge "Fix for Issue 3370836 : JNI files for Overlay optmization." into honeycomb
2011-01-26 12:46:20 -08:00
Mathias Agopian
cafa312b0b
am 947bbc91: am a0f40033: Merge "fix [3385504] Surface flinger hang when adding dim surface" into honeycomb
...
* commit '947bbc914a3c6723dcd8ff1fcca2fc61e557bacc':
fix [3385504] Surface flinger hang when adding dim surface
2011-01-26 12:44:47 -08:00
Mathias Agopian
aebc3fa75f
am a0f40033: Merge "fix [3385504] Surface flinger hang when adding dim surface" into honeycomb
...
* commit 'a0f40033c03a0b64538bf1c22f83d3c9a325ff87':
fix [3385504] Surface flinger hang when adding dim surface
2011-01-26 12:43:16 -08:00
Mathias Agopian
b42757b262
Merge "fix [3385504] Surface flinger hang when adding dim surface" into honeycomb
2011-01-26 12:41:02 -08:00
Winson Chung
d73278663e
am 38fe6ff4: am 2c070bae: Merge "Re-enabling queued unbinding of services after requests to the service. (3394210)" into honeycomb
...
* commit '38fe6ff45a6cbc328d1b92c9b9d79c65c3fb29ae':
Re-enabling queued unbinding of services after requests to the service. (3394210)
2011-01-26 12:35:21 -08:00
Winson Chung
3db4c71315
am 2c070bae: Merge "Re-enabling queued unbinding of services after requests to the service. (3394210)" into honeycomb
...
* commit '2c070bae4493cd1976c5086ec4cbf6ce10482742':
Re-enabling queued unbinding of services after requests to the service. (3394210)
2011-01-26 12:32:50 -08:00
Winson Chung
5085c0f055
Merge "Re-enabling queued unbinding of services after requests to the service. (3394210)" into honeycomb
2011-01-26 12:30:26 -08:00
Jaikumar Ganesh
6b22cd73c8
am 48f73779: am e9b644fc: Merge "Fix some unmatched javadoc tags." into honeycomb
...
* commit '48f737798070471cefeeaf418c75ea55f8b925e9':
Fix some unmatched javadoc tags.
2011-01-26 12:27:58 -08:00
Jaikumar Ganesh
c0200c74bb
am e9b644fc: Merge "Fix some unmatched javadoc tags." into honeycomb
...
* commit 'e9b644fcef08b0716efd3843ca7152e75cde3447':
Fix some unmatched javadoc tags.
2011-01-26 12:25:29 -08:00
Jaikumar Ganesh
9e9bd95624
Merge "Fix some unmatched javadoc tags." into honeycomb
2011-01-26 12:23:15 -08:00
Andreas Huber
792130ebf5
am 11934aa3: am 373d357a: Merge "More instrumentation to track down the hardware decoder not shutting down bug." into honeycomb
...
* commit '11934aa32102d56ea920b058cb3cc9a455cd2232':
More instrumentation to track down the hardware decoder not shutting down bug.
2011-01-26 12:12:33 -08:00
Andreas Huber
fe62bfe396
am 1a6e6d55: am 6df89fde: Merge "Ignore errors returned from native_window_set_crop." into honeycomb
...
* commit '1a6e6d55b8dd33b3bd2b52849d39ef96b556b52f':
Ignore errors returned from native_window_set_crop.
2011-01-26 12:12:28 -08:00
Andreas Huber
7ae6e78f09
am 373d357a: Merge "More instrumentation to track down the hardware decoder not shutting down bug." into honeycomb
...
* commit '373d357a8b13dc2cdc82d9e1d6144fb26e3bb202':
More instrumentation to track down the hardware decoder not shutting down bug.
2011-01-26 12:10:00 -08:00
Andreas Huber
7ab2d67b6c
am 6df89fde: Merge "Ignore errors returned from native_window_set_crop." into honeycomb
...
* commit '6df89fde0db446bb530ab872b373b1faa3ccb06c':
Ignore errors returned from native_window_set_crop.
2011-01-26 12:09:56 -08:00
Andreas Huber
f55cb8a261
Merge "More instrumentation to track down the hardware decoder not shutting down bug." into honeycomb
2011-01-26 12:08:09 -08:00
Andreas Huber
af514cd1c2
Merge "Ignore errors returned from native_window_set_crop." into honeycomb
2011-01-26 12:06:39 -08:00
Jason Sams
874362fb14
am 83af7012: (-s ours) am e0fc4b70: Merge "DO NOT MERGE Remove the rs_quaternion functions until mr1" into honeycomb
...
* commit '83af70126f2408b3ec835a20a745502789458c7a':
DO NOT MERGE Remove the rs_quaternion functions until mr1
2011-01-26 11:59:14 -08:00
Jason Sams
f308367984
am 2e42038d: am e361ca64: Merge "Migrating functions for on device linking." into honeycomb
...
* commit '2e42038d4efe9b859fc536c7e5283b9a0e2e17dd':
Migrating functions for on device linking.
2011-01-26 11:59:10 -08:00
Jason Sams
31f6cea70a
am e0fc4b70: Merge "DO NOT MERGE Remove the rs_quaternion functions until mr1" into honeycomb
...
* commit 'e0fc4b70f812cef4c8850be91b008e75b28757f3':
DO NOT MERGE Remove the rs_quaternion functions until mr1
2011-01-26 11:57:12 -08:00
Jason Sams
376ad326c1
am e361ca64: Merge "Migrating functions for on device linking." into honeycomb
...
* commit 'e361ca6428e137410ab828f5dee6148b8bdc29b3':
Migrating functions for on device linking.
2011-01-26 11:57:08 -08:00
Robert Greenwalt
81d1e74f88
Merge "Make the interface with DHCP IPv6 capable."
2011-01-26 11:56:19 -08:00
Jason Sams
9e4b4f5b1f
Merge "DO NOT MERGE Remove the rs_quaternion functions until mr1" into honeycomb
2011-01-26 11:54:38 -08:00
Jason Sams
1afd847713
Merge "Migrating functions for on device linking." into honeycomb
2011-01-26 11:54:33 -08:00
Joe Onorato
a04e98054b
am a4a5ec5e: am 1aadb210: Merge changes I48392c75,Id09437a4,I4a0aa878 into honeycomb
...
* commit 'a4a5ec5e748f99c40301c9c422b3d36cb44c6081':
Expose the window flags for lights out mode.
Make TabletStatusBar call into StatusBarManagerService when it goes out of lights out mode on its own.
Make FLAG_FULLSCREEN not go into lights out mode anymore.
2011-01-26 11:50:38 -08:00
Joe Onorato
9a9b18dcae
am 1aadb210: Merge changes I48392c75,Id09437a4,I4a0aa878 into honeycomb
...
* commit '1aadb2108d7614d9d1ff61b41c6c31cb8d211ab9':
Expose the window flags for lights out mode.
Make TabletStatusBar call into StatusBarManagerService when it goes out of lights out mode on its own.
Make FLAG_FULLSCREEN not go into lights out mode anymore.
2011-01-26 11:48:48 -08:00
Andreas Huber
e621600e96
am e328d1c0: am a9f27fa6: Merge "Protect notification callback parameters with a mutex." into honeycomb
...
* commit 'e328d1c0bea62f4dc28210dbcab0da40f4449bf2':
Protect notification callback parameters with a mutex.
2011-01-26 11:48:12 -08:00
Andreas Huber
c240629f67
am 38a1714b: am 7765c65d: Merge "Linux sockets suck, closing a socket descriptor does not abort pending recv/send calls." into honeycomb
...
* commit '38a1714bf79821dad296eeddfda1b6a7ce93ebbd':
Linux sockets suck, closing a socket descriptor does not abort pending recv/send calls.
2011-01-26 11:48:07 -08:00
Andreas Huber
e3cee8d424
am 807398e7: am d030359f: Merge "Instead of not feeding the AudioTrack any data after EOS, play silence instead." into honeycomb
...
* commit '807398e7f0718aaa9e8f53c556d0707c083819cf':
Instead of not feeding the AudioTrack any data after EOS, play silence instead.
2011-01-26 11:48:01 -08:00
Joe Onorato
e53ebac0df
Merge changes I48392c75,Id09437a4,I4a0aa878 into honeycomb
...
* changes:
Expose the window flags for lights out mode.
Make TabletStatusBar call into StatusBarManagerService when it goes out of lights out mode on its own.
Make FLAG_FULLSCREEN not go into lights out mode anymore.
2011-01-26 11:46:58 -08:00
Andreas Huber
69993edb08
am a9f27fa6: Merge "Protect notification callback parameters with a mutex." into honeycomb
...
* commit 'a9f27fa631ab21d52c75842ccaacc1cbcd75fca0':
Protect notification callback parameters with a mutex.
2011-01-26 11:44:17 -08:00
Andreas Huber
68cb793b7d
am 7765c65d: Merge "Linux sockets suck, closing a socket descriptor does not abort pending recv/send calls." into honeycomb
...
* commit '7765c65dbe1ba8f2229f2fec5a83ba2d1da79733':
Linux sockets suck, closing a socket descriptor does not abort pending recv/send calls.
2011-01-26 11:44:11 -08:00
Andreas Huber
f7b13c803d
am d030359f: Merge "Instead of not feeding the AudioTrack any data after EOS, play silence instead." into honeycomb
...
* commit 'd030359ff10a031c762d4f229d9c1bdfd366cb50':
Instead of not feeding the AudioTrack any data after EOS, play silence instead.
2011-01-26 11:43:50 -08:00
Kenny Root
f4ed3e8206
am 7dbf0696: resolved conflicts for merge of 2c1d0967 to honeycomb-plus-aosp
...
* commit '7dbf0696ef37097f2bcec058f876f7f4ba63d357':
Make ObbActionListener a on-way call
2011-01-26 11:43:31 -08:00
Andreas Huber
d9f39c74b8
Merge "Protect notification callback parameters with a mutex." into honeycomb
2011-01-26 11:28:01 -08:00
Andreas Huber
bdb1d2fb52
Merge "Linux sockets suck, closing a socket descriptor does not abort pending recv/send calls." into honeycomb
2011-01-26 11:24:13 -08:00
JP Abgrall
ae11d9dc9a
Merge "dumpstate: improved collection, better error handling."
2011-01-26 11:13:28 -08:00
Andreas Huber
74f340a126
Merge "Instead of not feeding the AudioTrack any data after EOS, play silence instead." into honeycomb
2011-01-26 11:11:50 -08:00
Kenny Root
c2625b69a3
resolved conflicts for merge of 2c1d0967 to honeycomb-plus-aosp
...
Change-Id: Ie9b0166b0260ee7eea7bdd275e64f2714024bf1c
2011-01-26 11:10:36 -08:00
Kenny Root
6c047479e1
Merge "Make ObbActionListener a on-way call" into honeycomb
2011-01-26 11:01:14 -08:00