OSDN Git Service
Mathias Agopian [Thu, 9 Sep 2010 18:58:14 +0000 (11:58 -0700)]
am
fec5d38b: Merge "option to enable multisampling" into gingerbread
Merge commit '
fec5d38baf4487d8ab0143451a3f2c39edeeb5b2' into gingerbread-plus-aosp
* commit '
fec5d38baf4487d8ab0143451a3f2c39edeeb5b2':
option to enable multisampling
Mathias Agopian [Thu, 9 Sep 2010 18:55:00 +0000 (11:55 -0700)]
Merge "option to enable multisampling" into gingerbread
Mathias Agopian [Thu, 9 Sep 2010 18:53:17 +0000 (11:53 -0700)]
option to enable multisampling
multisampling can be enabled by specifying the number of
samples desired on the command line.
Change-Id: I5f93c93ae7ada54bcd646c1065e07890d0cb9808
Steve Howard [Thu, 9 Sep 2010 18:26:08 +0000 (11:26 -0700)]
am
e3692d15: Merge "Hidden API to control sorting of download manager queries." into gingerbread
Merge commit '
e3692d153e0f66a5620eb96bd75ce92585b9fc04' into gingerbread-plus-aosp
* commit '
e3692d153e0f66a5620eb96bd75ce92585b9fc04':
Hidden API to control sorting of download manager queries.
Mathias Agopian [Thu, 9 Sep 2010 18:23:16 +0000 (11:23 -0700)]
am
6808e6a8: Merge "Fix a few typos in EGL wrapper" into gingerbread
Merge commit '
6808e6a867ba0b32f8bd97163e134c2866423f01' into gingerbread-plus-aosp
* commit '
6808e6a867ba0b32f8bd97163e134c2866423f01':
Fix a few typos in EGL wrapper
Steve Howard [Thu, 9 Sep 2010 18:22:38 +0000 (11:22 -0700)]
Merge "Hidden API to control sorting of download manager queries." into gingerbread
Mathias Agopian [Thu, 9 Sep 2010 18:20:02 +0000 (11:20 -0700)]
Merge "Fix a few typos in EGL wrapper" into gingerbread
Mathias Agopian [Thu, 9 Sep 2010 18:12:54 +0000 (11:12 -0700)]
Fix a few typos in EGL wrapper
Change-Id: I3b815ca6ec334ca12088f9721eece33df42b2e46
Jaikumar Ganesh [Thu, 9 Sep 2010 17:26:54 +0000 (10:26 -0700)]
am
9395b465: Merge "Fix to get A2DP to connect after unpairing" into gingerbread
Merge commit '
9395b4656aca4b00d080ada89a44631459ad7b85' into gingerbread-plus-aosp
* commit '
9395b4656aca4b00d080ada89a44631459ad7b85':
Fix to get A2DP to connect after unpairing
Jaikumar Ganesh [Thu, 9 Sep 2010 17:23:55 +0000 (10:23 -0700)]
Merge "Fix to get A2DP to connect after unpairing" into gingerbread
Andreas Huber [Thu, 9 Sep 2010 17:15:33 +0000 (10:15 -0700)]
am
f3de053c: Merge "Instead of asserting return a runtime error if the maximum sample size cannot be determined." into gingerbread
Merge commit '
f3de053c0a525f85f763ab9b8781ae95ef3e930e' into gingerbread-plus-aosp
* commit '
f3de053c0a525f85f763ab9b8781ae95ef3e930e':
Instead of asserting return a runtime error if the maximum sample size cannot be determined.
James Dong [Thu, 9 Sep 2010 17:15:29 +0000 (10:15 -0700)]
am
5c43a7af: Merge "When 32-bit offset is used, if the requested max file size is greater than the 32-bit offset limit, set the limit to the max 32-bit offset limit." into gingerbread
Merge commit '
5c43a7af7b9530016b922ddec0401ab9199cd595' into gingerbread-plus-aosp
* commit '
5c43a7af7b9530016b922ddec0401ab9199cd595':
When 32-bit offset is used,
Andreas Huber [Thu, 9 Sep 2010 17:13:26 +0000 (10:13 -0700)]
Merge "Instead of asserting return a runtime error if the maximum sample size cannot be determined." into gingerbread
James Dong [Thu, 9 Sep 2010 17:13:08 +0000 (10:13 -0700)]
Merge "When 32-bit offset is used, if the requested max file size is greater than the 32-bit offset limit, set the limit to the max 32-bit offset limit." into gingerbread
Gilles Debunne [Thu, 9 Sep 2010 17:04:32 +0000 (10:04 -0700)]
am
ab86b782: Merge "Fix for text selection in horizontally scrolled TextViews." into gingerbread
Merge commit '
ab86b782fd2c8c7b1e6b50d30482aa2b8f890e80' into gingerbread-plus-aosp
* commit '
ab86b782fd2c8c7b1e6b50d30482aa2b8f890e80':
Fix for text selection in horizontally scrolled TextViews.
Gilles Debunne [Thu, 9 Sep 2010 17:02:05 +0000 (10:02 -0700)]
Merge "Fix for text selection in horizontally scrolled TextViews." into gingerbread
Andreas Huber [Thu, 9 Sep 2010 17:01:05 +0000 (10:01 -0700)]
am
a063cd64: Merge "Instead of asserting, publish no tracks if an MP3Extractor is used on non-mp3 content." into gingerbread
Merge commit '
a063cd6478254bba3290576ae5556abf469d6535' into gingerbread-plus-aosp
* commit '
a063cd6478254bba3290576ae5556abf469d6535':
Instead of asserting, publish no tracks if an MP3Extractor is used on non-mp3 content.
Andreas Huber [Thu, 9 Sep 2010 16:59:03 +0000 (09:59 -0700)]
Merge "Instead of asserting, publish no tracks if an MP3Extractor is used on non-mp3 content." into gingerbread
Robert Greenwalt [Thu, 9 Sep 2010 16:49:15 +0000 (09:49 -0700)]
am
0727a865: Merge "Add network condition reporting." into gingerbread
Merge commit '
0727a865d83b944c2fecc0bf1228a36976fe5300' into gingerbread-plus-aosp
* commit '
0727a865d83b944c2fecc0bf1228a36976fe5300':
Add network condition reporting.
Robert Greenwalt [Thu, 9 Sep 2010 16:41:05 +0000 (09:41 -0700)]
Merge "Add network condition reporting." into gingerbread
Chia-chi Yeh [Thu, 9 Sep 2010 09:39:58 +0000 (02:39 -0700)]
am
f6936a3a: Merge "RTP: prevent buffer overflow in AudioRecord." into gingerbread
Merge commit '
f6936a3a52b6bb6de27f75d4e38d116e896b7f4d' into gingerbread-plus-aosp
* commit '
f6936a3a52b6bb6de27f75d4e38d116e896b7f4d':
RTP: prevent buffer overflow in AudioRecord.
Chia-chi Yeh [Thu, 9 Sep 2010 09:37:07 +0000 (02:37 -0700)]
Merge "RTP: prevent buffer overflow in AudioRecord." into gingerbread
Chung-yih Wang [Thu, 9 Sep 2010 05:42:52 +0000 (22:42 -0700)]
am
4d1e0121: Change the keep-alive interval to 10 seconds.
Merge commit '
4d1e0121277b566b5e1c22e790a3b607b75d945d' into gingerbread-plus-aosp
* commit '
4d1e0121277b566b5e1c22e790a3b607b75d945d':
Change the keep-alive interval to 10 seconds.
Neal Nguyen [Thu, 9 Sep 2010 03:23:43 +0000 (20:23 -0700)]
Merge "Adding Download Manager Integration, stress, and hosts-based tests." into gingerbread-plus-aosp
Mathias Agopian [Thu, 9 Sep 2010 02:01:37 +0000 (19:01 -0700)]
am
edbb8083: Merge "add a fps counter to sanangeles demo" into gingerbread
Merge commit '
edbb8083a815e9d911f8e659fc5c293543fdf502' into gingerbread-plus-aosp
* commit '
edbb8083a815e9d911f8e659fc5c293543fdf502':
add a fps counter to sanangeles demo
Mathias Agopian [Thu, 9 Sep 2010 01:57:42 +0000 (18:57 -0700)]
Merge "add a fps counter to sanangeles demo" into gingerbread
Mathias Agopian [Thu, 9 Sep 2010 01:55:42 +0000 (18:55 -0700)]
add a fps counter to sanangeles demo
Change-Id: I9a9473ce213301cc7661fddfb1ef5a6ffcb346d4
Dirk Dougherty [Thu, 9 Sep 2010 01:14:04 +0000 (18:14 -0700)]
am
ea68cab8: am
3eb07ea4: Merge "Doc change: Add notes for SDK Tools r7 and ADT 0.9.8." into froyo
Merge commit '
ea68cab8a33d3169de33c7112000cd3dae233afe' into gingerbread-plus-aosp
* commit '
ea68cab8a33d3169de33c7112000cd3dae233afe':
Doc change: Add notes for SDK Tools r7 and ADT 0.9.8.
Dirk Dougherty [Thu, 9 Sep 2010 01:05:58 +0000 (18:05 -0700)]
am
3eb07ea4: Merge "Doc change: Add notes for SDK Tools r7 and ADT 0.9.8." into froyo
Merge commit '
3eb07ea483225974484c018d7d5affbf4815ceb2' into gingerbread
* commit '
3eb07ea483225974484c018d7d5affbf4815ceb2':
Doc change: Add notes for SDK Tools r7 and ADT 0.9.8.
James Dong [Thu, 9 Sep 2010 00:54:28 +0000 (17:54 -0700)]
am
d353c840: Merge "HW audio encoder expects timestamp via kKeyTime from each input buffer" into gingerbread
Merge commit '
d353c840ad5bf1b4e6bfba0e10bcdc79223bcdf7' into gingerbread-plus-aosp
* commit '
d353c840ad5bf1b4e6bfba0e10bcdc79223bcdf7':
HW audio encoder expects timestamp via kKeyTime from each input buffer
Dirk Dougherty [Thu, 9 Sep 2010 00:52:45 +0000 (17:52 -0700)]
Merge "Doc change: Add notes for SDK Tools r7 and ADT 0.9.8." into froyo
James Dong [Thu, 9 Sep 2010 00:51:59 +0000 (17:51 -0700)]
Merge "HW audio encoder expects timestamp via kKeyTime from each input buffer" into gingerbread
Mike LeBeau [Thu, 9 Sep 2010 00:46:22 +0000 (17:46 -0700)]
am
46b84d5b: Merge "Add MediaStore.ACTION_MEDIA_PLAY_FROM_SEARCH intent for open-ended search and play of music. This is used, for instance, by Google\'s new "listen to" Voice Action." into gingerbread
Merge commit '
46b84d5b4a44dbab8e0f6ee11f3ab42e11ce97bb' into gingerbread-plus-aosp
* commit '
46b84d5b4a44dbab8e0f6ee11f3ab42e11ce97bb':
Add MediaStore.ACTION_MEDIA_PLAY_FROM_SEARCH intent for open-ended
Mike LeBeau [Thu, 9 Sep 2010 00:43:15 +0000 (17:43 -0700)]
Merge "Add MediaStore.ACTION_MEDIA_PLAY_FROM_SEARCH intent for open-ended search and play of music. This is used, for instance, by Google's new "listen to" Voice Action." into gingerbread
Eric Laurent [Thu, 9 Sep 2010 00:19:43 +0000 (17:19 -0700)]
am
95d86480: Merge "Modify type of some environmental reverb parameters" into gingerbread
Merge commit '
95d8648054223a501fe5390edef7e5d9383a4be8' into gingerbread-plus-aosp
* commit '
95d8648054223a501fe5390edef7e5d9383a4be8':
Modify type of some environmental reverb parameters
Eric Laurent [Thu, 9 Sep 2010 00:17:38 +0000 (17:17 -0700)]
Merge "Modify type of some environmental reverb parameters" into gingerbread
Mathias Agopian [Wed, 8 Sep 2010 23:46:46 +0000 (16:46 -0700)]
am
9bfb060a: Merge "Force wallpaper surface to 565." into gingerbread
Merge commit '
9bfb060ac4e30c82ec2c269b78cc758a6cb5daf8' into gingerbread-plus-aosp
* commit '
9bfb060ac4e30c82ec2c269b78cc758a6cb5daf8':
Force wallpaper surface to 565.
Mathias Agopian [Wed, 8 Sep 2010 23:43:42 +0000 (16:43 -0700)]
Merge "Force wallpaper surface to 565." into gingerbread
John Wang [Wed, 8 Sep 2010 22:56:41 +0000 (15:56 -0700)]
am
a48dc39b: Add hangupForegroundResumeBackground().
Merge commit '
a48dc39bd55c5ddcd991e08f791fd18d94a0db12' into gingerbread-plus-aosp
* commit '
a48dc39bd55c5ddcd991e08f791fd18d94a0db12':
Add hangupForegroundResumeBackground().
Brad Fitzpatrick [Wed, 8 Sep 2010 22:26:57 +0000 (15:26 -0700)]
am
65634a79: Merge "Don\'t block in the BackupManagerService.dataChanged() Binder call." into gingerbread
Merge commit '
65634a7935ed6f173179e7ac91a05288693b2bbf' into gingerbread-plus-aosp
* commit '
65634a7935ed6f173179e7ac91a05288693b2bbf':
Don't block in the BackupManagerService.dataChanged() Binder call.
Brad Fitzpatrick [Wed, 8 Sep 2010 22:20:20 +0000 (15:20 -0700)]
Merge "Don't block in the BackupManagerService.dataChanged() Binder call." into gingerbread
Gilles Debunne [Wed, 8 Sep 2010 22:02:20 +0000 (15:02 -0700)]
am
d9c80ab3: Merge "Fix for a memory leak in TextKeyListener." into gingerbread
Merge commit '
d9c80ab31ac3755141765e2c030bd1404ff0b050' into gingerbread-plus-aosp
* commit '
d9c80ab31ac3755141765e2c030bd1404ff0b050':
Fix for a memory leak in TextKeyListener.
Gilles Debunne [Wed, 8 Sep 2010 21:58:23 +0000 (14:58 -0700)]
Merge "Fix for a memory leak in TextKeyListener." into gingerbread
Dianne Hackborn [Wed, 8 Sep 2010 21:34:41 +0000 (14:34 -0700)]
am
ee455f5a: Merge "People holding partial wake locks now get blamed for CPU usage." into gingerbread
Merge commit '
ee455f5a9572bc0d23c3328f6c22da91dc109a50' into gingerbread-plus-aosp
* commit '
ee455f5a9572bc0d23c3328f6c22da91dc109a50':
People holding partial wake locks now get blamed for CPU usage.
Jake Hamby [Wed, 8 Sep 2010 21:34:31 +0000 (14:34 -0700)]
am
5872e9d7: Merge "Allow incoming SMS until internal storage is almost full." into gingerbread
Merge commit '
5872e9d7f31e5a4c5f3d871dba02b6d72a7ada78' into gingerbread-plus-aosp
* commit '
5872e9d7f31e5a4c5f3d871dba02b6d72a7ada78':
Allow incoming SMS until internal storage is almost full.
Jeff Brown [Wed, 8 Sep 2010 21:34:26 +0000 (14:34 -0700)]
am
b21fb104: Fix key repeat delay.
Merge commit '
b21fb104cc95fe7e5daf3b3626241e525c39a3f1' into gingerbread-plus-aosp
* commit '
b21fb104cc95fe7e5daf3b3626241e525c39a3f1':
Fix key repeat delay.
Dianne Hackborn [Wed, 8 Sep 2010 21:15:35 +0000 (14:15 -0700)]
Merge "People holding partial wake locks now get blamed for CPU usage." into gingerbread
Jake Hamby [Wed, 8 Sep 2010 19:49:27 +0000 (12:49 -0700)]
Merge "Allow incoming SMS until internal storage is almost full." into gingerbread
Jeff Brown [Wed, 8 Sep 2010 19:29:49 +0000 (12:29 -0700)]
am
de2f3340: Update current.xml for touch filtering feature.
Merge commit '
de2f3340d64e20e51029ff438f0d635d97b8a3e0' into gingerbread-plus-aosp
* commit '
de2f3340d64e20e51029ff438f0d635d97b8a3e0':
Update current.xml for touch filtering feature.
Jeff Brown [Tue, 7 Sep 2010 17:44:57 +0000 (10:44 -0700)]
Fix key repeat delay.
Change-Id: I6216e082324ee29bf50e37acc673350ca5417c4d
Jeff Brown [Wed, 8 Sep 2010 18:55:24 +0000 (11:55 -0700)]
am
85a31767: Add support for secure views.
Merge commit '
85a3176704b5bfbeece9bd928369fbb76eec7dc6' into gingerbread-plus-aosp
* commit '
85a3176704b5bfbeece9bd928369fbb76eec7dc6':
Add support for secure views.
Jeff Brown [Thu, 2 Sep 2010 00:01:00 +0000 (17:01 -0700)]
Add support for secure views.
Added the MotionEvent.FLAG_WINDOW_IS_OBSCURED flag which is set by the
input manager whenever another visible window is partly or wholly obscured
the target of a touch event so that applications can filter touches
accordingly.
Added a "filterTouchesWhenObscured" attribute to View which can be used to
enable filtering of touches when the view's window is obscured.
Change-Id: I936d9c85013fd2d77fb296a600528d30a29027d2
Jean-Baptiste Queru [Wed, 8 Sep 2010 18:03:22 +0000 (11:03 -0700)]
Merge "Revert "resolve conflicts"" into gingerbread-plus-aosp
Erik [Wed, 8 Sep 2010 18:01:27 +0000 (11:01 -0700)]
am
c0b4f6d3: Merge "Adds a time zone parameter to formatDateRange" into gingerbread
Merge commit '
c0b4f6d30d962d75125628317b5f5ea622531dfe' into gingerbread-plus-aosp
* commit '
c0b4f6d30d962d75125628317b5f5ea622531dfe':
Adds a time zone parameter to formatDateRange
Erik [Wed, 8 Sep 2010 17:58:12 +0000 (10:58 -0700)]
Merge "Adds a time zone parameter to formatDateRange" into gingerbread
Gilles Debunne [Wed, 8 Sep 2010 17:32:42 +0000 (10:32 -0700)]
am
468394fc: Text Selection: smart word detection. DO NOT MERGE.
Merge commit '
468394fc6d1cb0c9078c2f98aa056860f7e0d743' into gingerbread-plus-aosp
* commit '
468394fc6d1cb0c9078c2f98aa056860f7e0d743':
Text Selection: smart word detection. DO NOT MERGE.
Elliott Hughes [Wed, 8 Sep 2010 17:32:38 +0000 (10:32 -0700)]
am
4c7d3f28: Merge "Remove dead code: NIOBuffer." into gingerbread
Merge commit '
4c7d3f28898f4e0d8e9f54537fb92948e650df7f' into gingerbread-plus-aosp
* commit '
4c7d3f28898f4e0d8e9f54537fb92948e650df7f':
Remove dead code: NIOBuffer.
Chung-yih Wang [Wed, 8 Sep 2010 17:32:13 +0000 (10:32 -0700)]
am
66907078: Merge "Fix the dialing from contact for internet address." into gingerbread
Merge commit '
669070787cc10377c2e5c3fa187babc728d96245' into gingerbread-plus-aosp
* commit '
669070787cc10377c2e5c3fa187babc728d96245':
Fix the dialing from contact for internet address.
Chung-yih Wang [Wed, 8 Sep 2010 17:28:09 +0000 (10:28 -0700)]
am
5de1d36d: Log outbound proxy address if exists for debugging.
Merge commit '
5de1d36dd0415c4cf9afdf093a4915951ef6c770' into gingerbread-plus-aosp
* commit '
5de1d36dd0415c4cf9afdf093a4915951ef6c770':
Log outbound proxy address if exists for debugging.
Jean-Baptiste Queru [Wed, 8 Sep 2010 17:02:35 +0000 (10:02 -0700)]
resolve conflicts
Change-Id: I87f854430f7083cd2f2e28b4ec4a7112ef6fe4f1
Elliott Hughes [Wed, 8 Sep 2010 16:30:41 +0000 (09:30 -0700)]
Merge "Remove dead code: NIOBuffer." into gingerbread
Chung-yih Wang [Wed, 8 Sep 2010 10:32:01 +0000 (03:32 -0700)]
Merge "Fix the dialing from contact for internet address." into gingerbread
Wei-Ta Chen [Wed, 8 Sep 2010 04:48:48 +0000 (21:48 -0700)]
am
1b214be9: Merge "Revert "Rename LargeBitmap to BitmapRegionDecoder for having a better API."" into gingerbread
Merge commit '
1b214be92ac206d8ac6ef4967db6e2859d91ab49' into gingerbread-plus-aosp
* commit '
1b214be92ac206d8ac6ef4967db6e2859d91ab49':
Revert "Rename LargeBitmap to BitmapRegionDecoder for having a better API."
Gilles Debunne [Wed, 8 Sep 2010 04:48:39 +0000 (21:48 -0700)]
am
d6e56895: update-api step missing from 64963.
Merge commit '
d6e56895f647d3c6ea33cea15fdb7b1e9ff3f537' into gingerbread-plus-aosp
* commit '
d6e56895f647d3c6ea33cea15fdb7b1e9ff3f537':
update-api step missing from 64963.
Brad Fitzpatrick [Wed, 8 Sep 2010 04:41:09 +0000 (21:41 -0700)]
resolved conflicts for merge of
64591009 to gingerbread-plus-aosp
Change-Id: Id9ebca9993f97a79cb2a6c41a7566d473ccc5b7e
Neal Nguyen [Wed, 8 Sep 2010 03:55:22 +0000 (20:55 -0700)]
Merge "Adding Download Manager Integration, stress, and hosts-based tests." into gingerbread
Wei-Ta Chen [Wed, 8 Sep 2010 03:36:13 +0000 (20:36 -0700)]
Merge "Revert "Rename LargeBitmap to BitmapRegionDecoder for having a better API."" into gingerbread
Brad Fitzpatrick [Wed, 8 Sep 2010 03:06:26 +0000 (20:06 -0700)]
Merge "Fix a race between requesting/loading/writing SharedPreferences." into gingerbread
Hung-ying Tyan [Wed, 8 Sep 2010 02:40:40 +0000 (19:40 -0700)]
am
d580eee2: Merge "SipPhone: switch to its own phone type PHONE_TYPE_SIP." into gingerbread
Merge commit '
d580eee29b50e1f11485b655fe5e6cc5a564615b' into gingerbread-plus-aosp
* commit '
d580eee29b50e1f11485b655fe5e6cc5a564615b':
SipPhone: switch to its own phone type PHONE_TYPE_SIP.
Hung-ying Tyan [Wed, 8 Sep 2010 02:37:33 +0000 (19:37 -0700)]
Merge "SipPhone: switch to its own phone type PHONE_TYPE_SIP." into gingerbread
Kenny Root [Wed, 8 Sep 2010 02:35:47 +0000 (19:35 -0700)]
am
a19ef306: Revert "Free created FileMap when uncompressing files"
Merge commit '
a19ef306bd0a257c67b50f5e0e669e9fe52b0889' into gingerbread-plus-aosp
* commit '
a19ef306bd0a257c67b50f5e0e669e9fe52b0889':
Revert "Free created FileMap when uncompressing files"
Kenny Root [Wed, 8 Sep 2010 02:30:22 +0000 (19:30 -0700)]
Revert "Free created FileMap when uncompressing files"
This reverts commit
52b8235238fb4d8cf141020cc1ae33880929dc3f.
munmap() on a region that overlaps something else (e.g, the ZIP Central
Directory in this case) unmaps those other regions as well making the
ZipFileRO class unhappy. Revert this for now until we can have FileMap
deal with this craziness.
Gilles Debunne [Wed, 8 Sep 2010 01:59:22 +0000 (18:59 -0700)]
am
883bbb72: Merge "Hide mCursorController field in ArrowKeyMovementMethod." into gingerbread
Merge commit '
883bbb72284736b5601f9e96d1116969c51b75de' into gingerbread-plus-aosp
* commit '
883bbb72284736b5601f9e96d1116969c51b75de':
Hide mCursorController field in ArrowKeyMovementMethod.
Gilles Debunne [Wed, 8 Sep 2010 01:59:10 +0000 (18:59 -0700)]
am
dbd25cdb: Made text selection work in ExtractEditText. DO NOT MERGE
Merge commit '
dbd25cdbc3dcad573aaeaf493bc186006bce3d8e' into gingerbread-plus-aosp
* commit '
dbd25cdbc3dcad573aaeaf493bc186006bce3d8e':
Made text selection work in ExtractEditText. DO NOT MERGE
Gilles Debunne [Wed, 8 Sep 2010 01:53:55 +0000 (18:53 -0700)]
Merge "Hide mCursorController field in ArrowKeyMovementMethod." into gingerbread
Dmitry Shmidt [Wed, 8 Sep 2010 00:33:55 +0000 (17:33 -0700)]
am
d0f74ae0: Merge "Rename SETSUSPEND to SETSUSPENDOPT DO NOT MERGE" into gingerbread
Merge commit '
d0f74ae081bac9a9c8f7faf9288305647735d743' into gingerbread-plus-aosp
* commit '
d0f74ae081bac9a9c8f7faf9288305647735d743':
Rename SETSUSPEND to SETSUSPENDOPT DO NOT MERGE
Dmitry Shmidt [Wed, 8 Sep 2010 00:29:45 +0000 (17:29 -0700)]
Merge "Rename SETSUSPEND to SETSUSPENDOPT DO NOT MERGE" into gingerbread
Wei-Ta Chen [Wed, 8 Sep 2010 00:07:12 +0000 (17:07 -0700)]
am
b356f8ac: Merge "Rename LargeBitmap to BitmapRegionDecoder for having a better API." into gingerbread
Merge commit '
b356f8acec9fdfd36f01e5cca4fe3a28ecd6e628' into gingerbread-plus-aosp
* commit '
b356f8acec9fdfd36f01e5cca4fe3a28ecd6e628':
Rename LargeBitmap to BitmapRegionDecoder for having a better API.
Wei-Ta Chen [Wed, 8 Sep 2010 00:01:57 +0000 (17:01 -0700)]
Merge "Rename LargeBitmap to BitmapRegionDecoder for having a better API." into gingerbread
Dianne Hackborn [Tue, 7 Sep 2010 23:38:45 +0000 (16:38 -0700)]
am
2d3739d4: Merge "Modify native ALooper to take an explicit ident." into gingerbread
Merge commit '
2d3739d479d67ba736cefbdd6087a11eadfb14ea' into gingerbread-plus-aosp
* commit '
2d3739d479d67ba736cefbdd6087a11eadfb14ea':
Modify native ALooper to take an explicit ident.
Dianne Hackborn [Tue, 7 Sep 2010 23:32:48 +0000 (16:32 -0700)]
Merge "Modify native ALooper to take an explicit ident." into gingerbread
Dianne Hackborn [Tue, 7 Sep 2010 22:28:30 +0000 (15:28 -0700)]
Modify native ALooper to take an explicit ident.
The ALooper API now uses an explicit "identifier" for the integer
that is returned rather than implicitly using the fd. This allows
the APIs that had the fd to be a little more sane.
Change-Id: I8507f535ad484c0bdc4a1bd016d87bb09acd7ff0
Kenny Root [Tue, 7 Sep 2010 22:42:02 +0000 (15:42 -0700)]
am
25429378: Merge "Allow installd to handle large partitions" into gingerbread
Merge commit '
254293782a94652fd601d6b3f04ad447c072f714' into gingerbread-plus-aosp
* commit '
254293782a94652fd601d6b3f04ad447c072f714':
Allow installd to handle large partitions
Kenny Root [Tue, 7 Sep 2010 22:38:31 +0000 (15:38 -0700)]
Merge "Allow installd to handle large partitions" into gingerbread
Elliott Hughes [Tue, 7 Sep 2010 21:46:15 +0000 (14:46 -0700)]
am
45cda90b: Merge "Be brief." into gingerbread
Merge commit '
45cda90bdc178e253049c7067c78bf4b1204ba82' into gingerbread-plus-aosp
* commit '
45cda90bdc178e253049c7067c78bf4b1204ba82':
Be brief.
Joe Onorato [Tue, 7 Sep 2010 21:46:08 +0000 (14:46 -0700)]
am
1f6a21c2: Merge "Expose the TextAppearance.StatusBar.* styles." into gingerbread
Merge commit '
1f6a21c2377f33a754222a34fa98ea1e21a6d27d' into gingerbread-plus-aosp
* commit '
1f6a21c2377f33a754222a34fa98ea1e21a6d27d':
Expose the TextAppearance.StatusBar.* styles.
Elliott Hughes [Tue, 7 Sep 2010 21:41:36 +0000 (14:41 -0700)]
Merge "Be brief." into gingerbread
Joe Onorato [Tue, 7 Sep 2010 21:41:12 +0000 (14:41 -0700)]
Merge "Expose the TextAppearance.StatusBar.* styles." into gingerbread
Makoto Onuki [Tue, 7 Sep 2010 21:34:19 +0000 (14:34 -0700)]
am
1cc86da6: Merge "Don\'t fall through from TOKEN_EMAIL_LOOKUP" into gingerbread
Merge commit '
1cc86da61a361c84ef81e893440c500e33fae312' into gingerbread-plus-aosp
* commit '
1cc86da61a361c84ef81e893440c500e33fae312':
Don't fall through from TOKEN_EMAIL_LOOKUP
Makoto Onuki [Tue, 7 Sep 2010 21:31:34 +0000 (14:31 -0700)]
Merge "Don't fall through from TOKEN_EMAIL_LOOKUP" into gingerbread
Dianne Hackborn [Tue, 7 Sep 2010 21:15:17 +0000 (14:15 -0700)]
am
6e86915e: Merge "Fixes to battery stats debug output." into gingerbread
Merge commit '
6e86915e8f5dfffa60ae5d1a4ca9aa74912fd026' into gingerbread-plus-aosp
* commit '
6e86915e8f5dfffa60ae5d1a4ca9aa74912fd026':
Fixes to battery stats debug output.
Dianne Hackborn [Tue, 7 Sep 2010 21:10:38 +0000 (14:10 -0700)]
Merge "Fixes to battery stats debug output." into gingerbread
Dianne Hackborn [Tue, 7 Sep 2010 19:36:33 +0000 (12:36 -0700)]
am
11bbe200: Hopefully fix the build.
Merge commit '
11bbe200cba150cfa5593bb87b54f3072a5ab2c5' into gingerbread-plus-aosp
* commit '
11bbe200cba150cfa5593bb87b54f3072a5ab2c5':
Hopefully fix the build.
Dianne Hackborn [Tue, 7 Sep 2010 19:32:19 +0000 (12:32 -0700)]
Hopefully fix the build.
Change-Id: Id8cd92c0895c9939e1386ef488bd1309a3be3568
Dianne Hackborn [Tue, 7 Sep 2010 18:30:08 +0000 (11:30 -0700)]
am
f703b77c: Merge "Add system property to turn off scheduling groups." into gingerbread
Merge commit '
f703b77c96a6d133fda534158eaf6190ff7c87f7' into gingerbread-plus-aosp
* commit '
f703b77c96a6d133fda534158eaf6190ff7c87f7':
Add system property to turn off scheduling groups.
Dianne Hackborn [Tue, 7 Sep 2010 18:27:26 +0000 (11:27 -0700)]
Merge "Add system property to turn off scheduling groups." into gingerbread
Dianne Hackborn [Sat, 4 Sep 2010 00:07:07 +0000 (17:07 -0700)]
Add system property to turn off scheduling groups.
Do this:
adb shell setprop debug.sys.noschedgroups 1
Change-Id: I6e06a74205fd45ee1526ce71fe33944465d39984
Joe Onorato [Tue, 7 Sep 2010 18:18:46 +0000 (11:18 -0700)]
am
1f689f7e: Merge "When notifications are updated, don\'t re-show the ticker unless the text has changed." into gingerbread
Merge commit '
1f689f7e35464b1ccd3ce3307b6d92283ee1290d' into gingerbread-plus-aosp
* commit '
1f689f7e35464b1ccd3ce3307b6d92283ee1290d':
When notifications are updated, don't re-show the ticker unless the text has changed.
Brad Fitzpatrick [Tue, 7 Sep 2010 18:15:01 +0000 (11:15 -0700)]
am
b1104b37: Merge "Make SharedPreferencesBackupHelper wait for async SharedPreference writes" into gingerbread
Merge commit '
b1104b3713febb75164938a465c3022e1879245f' into gingerbread-plus-aosp
* commit '
b1104b3713febb75164938a465c3022e1879245f':
Make SharedPreferencesBackupHelper wait for async SharedPreference writes
Joe Onorato [Tue, 7 Sep 2010 18:14:56 +0000 (11:14 -0700)]
Merge "When notifications are updated, don't re-show the ticker unless the text has changed." into gingerbread