OSDN Git Service
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
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
Brad Fitzpatrick [Tue, 7 Sep 2010 18:12:51 +0000 (11:12 -0700)]
Merge "Make SharedPreferencesBackupHelper wait for async SharedPreference writes" into gingerbread
Eric Fischer [Tue, 7 Sep 2010 18:08:19 +0000 (11:08 -0700)]
am
745e751b: Merge "Preserve old translations for changed strings. DO NOT MERGE" into gingerbread
Merge commit '
745e751b251baa38e94dfce1fe264574d0204cc2' into gingerbread-plus-aosp
* commit '
745e751b251baa38e94dfce1fe264574d0204cc2':
Preserve old translations for changed strings. DO NOT MERGE
Eric Fischer [Tue, 7 Sep 2010 18:03:26 +0000 (11:03 -0700)]
Merge "Preserve old translations for changed strings. DO NOT MERGE" into gingerbread
Kenny Root [Tue, 7 Sep 2010 17:49:22 +0000 (10:49 -0700)]
am
2cb3e836: Merge "Use new nativeLibraryPath field for NativeActivity" into gingerbread
Merge commit '
2cb3e83654c99e202c170d9d0237d8d1f4054354' into gingerbread-plus-aosp
* commit '
2cb3e83654c99e202c170d9d0237d8d1f4054354':
Use new nativeLibraryPath field for NativeActivity
Kenny Root [Tue, 7 Sep 2010 17:46:14 +0000 (10:46 -0700)]
Merge "Use new nativeLibraryPath field for NativeActivity" into gingerbread
Hung-ying Tyan [Tue, 7 Sep 2010 03:16:51 +0000 (20:16 -0700)]
am
960b31e3: Merge "SipService: unset session listener if listener is gone." into gingerbread
Merge commit '
960b31e3b3b40f92665be4b7a79da7f05ea19751' into gingerbread-plus-aosp
* commit '
960b31e3b3b40f92665be4b7a79da7f05ea19751':
SipService: unset session listener if listener is gone.
Hung-ying Tyan [Tue, 7 Sep 2010 03:13:32 +0000 (20:13 -0700)]
Merge "SipService: unset session listener if listener is gone." into gingerbread
Brad Fitzpatrick [Tue, 7 Sep 2010 02:34:43 +0000 (19:34 -0700)]
am
612ff274: Quell annoying Java ascii/unicode warning.
Merge commit '
612ff27425cf2976396d992f32b58ab900c7d708' into gingerbread-plus-aosp
* commit '
612ff27425cf2976396d992f32b58ab900c7d708':
Quell annoying Java ascii/unicode warning.
Chung-yih Wang [Mon, 6 Sep 2010 05:01:38 +0000 (22:01 -0700)]
am
b6264a87: Fix the build.
Merge commit '
b6264a8795ed9469c80727123e3cafda1b07eda3' into gingerbread-plus-aosp
* commit '
b6264a8795ed9469c80727123e3cafda1b07eda3':
Fix the build.
Chung-yih Wang [Mon, 6 Sep 2010 04:12:57 +0000 (21:12 -0700)]
am
b12baad9: Add equals() funcation for SipPhone.
Merge commit '
b12baad9357c6e6aec1f7d84fd041c54fe963407' into gingerbread-plus-aosp
* commit '
b12baad9357c6e6aec1f7d84fd041c54fe963407':
Add equals() funcation for SipPhone.
Kenny Root [Sat, 4 Sep 2010 00:07:15 +0000 (17:07 -0700)]
am
6dc003a7: Merge "Reduce footprint of Signature from ~7000 to ~1448" into gingerbread
Merge commit '
6dc003a73f7f01aa5dd5831e777e2aa44f65b032' into gingerbread-plus-aosp
* commit '
6dc003a73f7f01aa5dd5831e777e2aa44f65b032':
Reduce footprint of Signature from ~7000 to ~1448
Kenny Root [Fri, 3 Sep 2010 23:59:42 +0000 (16:59 -0700)]
Merge "Reduce footprint of Signature from ~7000 to ~1448" into gingerbread
Jesse Wilson [Fri, 3 Sep 2010 23:42:51 +0000 (16:42 -0700)]
am
3326f804: Fix the last remaining gaps in our Java 6 API.
Merge commit '
3326f8043858152ea2a407a9a4c20fdcdc859e73' into gingerbread-plus-aosp
* commit '
3326f8043858152ea2a407a9a4c20fdcdc859e73':
Fix the last remaining gaps in our Java 6 API.
Eric Laurent [Fri, 3 Sep 2010 23:39:59 +0000 (16:39 -0700)]
am
7e427934: Merge "LVM release 1.08 delivery." into gingerbread
Merge commit '
7e427934e69db804f3ee803e6ffeef4a339e9b8b' into gingerbread-plus-aosp
* commit '
7e427934e69db804f3ee803e6ffeef4a339e9b8b':
LVM release 1.08 delivery.
Eric Laurent [Fri, 3 Sep 2010 23:35:54 +0000 (16:35 -0700)]
Merge "LVM release 1.08 delivery." into gingerbread
Adam Powell [Fri, 3 Sep 2010 23:33:37 +0000 (16:33 -0700)]
am
7627c221: DO NOT MERGE Tweak overscroll
Merge commit '
7627c221c6ce8bf433bf207b002eabe7236c4757' into gingerbread-plus-aosp
* commit '
7627c221c6ce8bf433bf207b002eabe7236c4757':
DO NOT MERGE Tweak overscroll
James Dong [Fri, 3 Sep 2010 22:45:01 +0000 (15:45 -0700)]
am
9077f8ec: Merge "Not all audio source has the drift time information" into gingerbread
Merge commit '
9077f8ec931a4c080948a85ce2e0f793f65e9b62' into gingerbread-plus-aosp
* commit '
9077f8ec931a4c080948a85ce2e0f793f65e9b62':
Not all audio source has the drift time information
James Dong [Fri, 3 Sep 2010 22:42:09 +0000 (15:42 -0700)]
Merge "Not all audio source has the drift time information" into gingerbread
Dianne Hackborn [Fri, 3 Sep 2010 22:23:46 +0000 (15:23 -0700)]
am
69717ccd: DO NOT MERGE. Some stuff that is Not Ready.
Merge commit '
69717ccd13bb5568b912701ab39d603cfa7091cc' into gingerbread-plus-aosp
* commit '
69717ccd13bb5568b912701ab39d603cfa7091cc':
DO NOT MERGE. Some stuff that is Not Ready.
Dianne Hackborn [Fri, 3 Sep 2010 22:18:39 +0000 (15:18 -0700)]
am
df3a0f50: Merge "Improve doc." into gingerbread
Merge commit '
df3a0f50c3480911e366c8c0781b0463fe063e82' into gingerbread-plus-aosp
* commit '
df3a0f50c3480911e366c8c0781b0463fe063e82':
Improve doc.
Dianne Hackborn [Fri, 3 Sep 2010 22:15:50 +0000 (15:15 -0700)]
Merge "Improve doc." into gingerbread
Dianne Hackborn [Fri, 3 Sep 2010 22:10:24 +0000 (15:10 -0700)]
am
e1aa82a4: Merge "Adding a feature denoting support for 5 or more fully independent multitouch pointers." into gingerbread
Merge commit '
e1aa82a4228d009537693253ba3a0113abbf5ab8' into gingerbread-plus-aosp
* commit '
e1aa82a4228d009537693253ba3a0113abbf5ab8':
Adding a feature denoting support for 5 or more fully
Dianne Hackborn [Fri, 3 Sep 2010 22:07:17 +0000 (15:07 -0700)]
Merge "Adding a feature denoting support for 5 or more fully independent multitouch pointers." into gingerbread
Andreas Huber [Fri, 3 Sep 2010 21:50:18 +0000 (14:50 -0700)]
am
9fee0b2a: Ogg files can be tagged to be automatically looping, this setting always overrides the MediaPlayer\'s setLooping setting.
Merge commit '
9fee0b2a02daa6fcf286ed930e45400dd3ba8dba' into gingerbread-plus-aosp
* commit '
9fee0b2a02daa6fcf286ed930e45400dd3ba8dba':
Ogg files can be tagged to be automatically looping, this setting always overrides the MediaPlayer's setLooping setting.
John Wang [Fri, 3 Sep 2010 21:08:32 +0000 (14:08 -0700)]
am
dc243482: Merge "Add API to get all foreground calls." into gingerbread
Merge commit '
dc243482d6e104c4a3cddaa694c2ee3c628c2c20' into gingerbread-plus-aosp
* commit '
dc243482d6e104c4a3cddaa694c2ee3c628c2c20':
Add API to get all foreground calls.
John Wang [Fri, 3 Sep 2010 21:06:20 +0000 (14:06 -0700)]
Merge "Add API to get all foreground calls." into gingerbread
Adam Powell [Fri, 3 Sep 2010 21:00:41 +0000 (14:00 -0700)]
am
e7c02ef4: Merge "Fix bug
2973252 - Make overscroll glow respect ifContentScrolls" into gingerbread
Merge commit '
e7c02ef40a10c599b13684a6f99a91eabd0f258f' into gingerbread-plus-aosp
* commit '
e7c02ef40a10c599b13684a6f99a91eabd0f258f':
Fix bug
2973252 - Make overscroll glow respect ifContentScrolls
Adam Powell [Fri, 3 Sep 2010 20:58:37 +0000 (13:58 -0700)]
Merge "Fix bug
2973252 - Make overscroll glow respect ifContentScrolls" into gingerbread
Andreas Huber [Fri, 3 Sep 2010 20:48:43 +0000 (13:48 -0700)]
am
cc4a38c6: Merge "Properly buffer a certain amount of data on streaming sources before finishing prepare()." into gingerbread
Merge commit '
cc4a38c60f52082f3c1970c7eda6756949c6e5d5' into gingerbread-plus-aosp
* commit '
cc4a38c60f52082f3c1970c7eda6756949c6e5d5':
Properly buffer a certain amount of data on streaming sources before finishing prepare().
Andreas Huber [Fri, 3 Sep 2010 20:46:02 +0000 (13:46 -0700)]
Merge "Properly buffer a certain amount of data on streaming sources before finishing prepare()." into gingerbread
Dianne Hackborn [Fri, 3 Sep 2010 20:26:30 +0000 (13:26 -0700)]
am
e25b4bc7: Merge "These are not ready to be exposed. Also rename them to be better." into gingerbread
Merge commit '
e25b4bc76fef584b38ce4e72f919fba119bdfa99' into gingerbread-plus-aosp
* commit '
e25b4bc76fef584b38ce4e72f919fba119bdfa99':
These are not ready to be exposed. Also rename them to be better.
Dianne Hackborn [Fri, 3 Sep 2010 20:24:33 +0000 (13:24 -0700)]
Merge "These are not ready to be exposed. Also rename them to be better." into gingerbread
Scott Main [Fri, 3 Sep 2010 20:18:28 +0000 (13:18 -0700)]
am
2b136832: am
c4367e54: fix code snippet error
Merge commit '
2b136832be7326caed0c79bae418c2dd54372bea' into gingerbread-plus-aosp
* commit '
2b136832be7326caed0c79bae418c2dd54372bea':
fix code snippet error
Scott Main [Fri, 3 Sep 2010 20:15:11 +0000 (13:15 -0700)]
am
c4367e54: fix code snippet error
Merge commit '
c4367e54e41f4e7a6c79b60dd80e66c9e6fdcfc3' into gingerbread
* commit '
c4367e54e41f4e7a6c79b60dd80e66c9e6fdcfc3':
fix code snippet error
Brad Fitzpatrick [Fri, 3 Sep 2010 19:49:44 +0000 (12:49 -0700)]
am
a2f2141c: Merge "More SharedPreferences commit() -> apply() changes." into gingerbread
Merge commit '
a2f2141c84923e34e003bec92b7435ea79b02ee8' into gingerbread-plus-aosp
* commit '
a2f2141c84923e34e003bec92b7435ea79b02ee8':
More SharedPreferences commit() -> apply() changes.
Brad Fitzpatrick [Fri, 3 Sep 2010 19:46:25 +0000 (12:46 -0700)]
Merge "More SharedPreferences commit() -> apply() changes." into gingerbread
Marco Nelissen [Fri, 3 Sep 2010 18:51:28 +0000 (11:51 -0700)]
am
d85621c9: Don\'t crash when extra logging is enabled.
Merge commit '
d85621c938286a568b1173e7ab29f80ab93d27e1' into gingerbread-plus-aosp
* commit '
d85621c938286a568b1173e7ab29f80ab93d27e1':
Don't crash when extra logging is enabled.
James Dong [Fri, 3 Sep 2010 18:33:47 +0000 (11:33 -0700)]
am
7755cdd6: Remove unused/debugging code from MP4 file writer
Merge commit '
7755cdd69690ccbb42c6fd47b3e9c4594d4ade82' into gingerbread-plus-aosp
* commit '
7755cdd69690ccbb42c6fd47b3e9c4594d4ade82':
Remove unused/debugging code from MP4 file writer
James Dong [Fri, 3 Sep 2010 16:55:38 +0000 (09:55 -0700)]
am
46e63b34: Merge "Better file size estimate" into gingerbread
Merge commit '
46e63b346770efa14451b8e67b7f7636c4e5a76c' into gingerbread-plus-aosp
* commit '
46e63b346770efa14451b8e67b7f7636c4e5a76c':
Better file size estimate
Kenny Root [Fri, 3 Sep 2010 16:55:33 +0000 (09:55 -0700)]
am
305bcbf0: Decrease PackageManagerService wait time for vold
Merge commit '
305bcbf0c961840c4505770d084a1caacc074dbb' into gingerbread-plus-aosp
* commit '
305bcbf0c961840c4505770d084a1caacc074dbb':
Decrease PackageManagerService wait time for vold
James Dong [Fri, 3 Sep 2010 16:53:13 +0000 (09:53 -0700)]
Merge "Better file size estimate" into gingerbread
Kenny Root [Fri, 3 Sep 2010 05:29:05 +0000 (22:29 -0700)]
am
12da9d74: Fix buffer compacting in NativeDaemonConnector
Merge commit '
12da9d7472ae87b841575d5358e19f143d12f900' into gingerbread-plus-aosp
* commit '
12da9d7472ae87b841575d5358e19f143d12f900':
Fix buffer compacting in NativeDaemonConnector
Hung-ying Tyan [Fri, 3 Sep 2010 02:26:56 +0000 (19:26 -0700)]
am
b355714a: Merge "SipManager: always return true for SIP API and VOIP support query." into gingerbread
Merge commit '
b355714a2995ebe343808e06f69da5067f52a833' into gingerbread-plus-aosp
* commit '
b355714a2995ebe343808e06f69da5067f52a833':
SipManager: always return true for SIP API and VOIP support query.
Hung-ying Tyan [Fri, 3 Sep 2010 02:23:31 +0000 (19:23 -0700)]
Merge "SipManager: always return true for SIP API and VOIP support query." into gingerbread
Scott Main [Fri, 3 Sep 2010 01:44:11 +0000 (18:44 -0700)]
am
3208557e: am
c5083cdf: Merge "clarify dp dimension description" into froyo
Merge commit '
3208557edca8c133fa32b7718acd22d77f1a9475' into gingerbread-plus-aosp
* commit '
3208557edca8c133fa32b7718acd22d77f1a9475':
clarify dp dimension description
James Dong [Fri, 3 Sep 2010 01:41:49 +0000 (18:41 -0700)]
am
7ed7668b: Merge "Calculate audio media drift time from AudioSource" into gingerbread
Merge commit '
7ed7668b30e70ca8e3f0f183364433326ed29f39' into gingerbread-plus-aosp
* commit '
7ed7668b30e70ca8e3f0f183364433326ed29f39':
Calculate audio media drift time from AudioSource
Scott Main [Fri, 3 Sep 2010 01:30:16 +0000 (18:30 -0700)]
am
c5083cdf: Merge "clarify dp dimension description" into froyo
Merge commit '
c5083cdfff55a8fdcc82198273afd7dbe6379879' into gingerbread
* commit '
c5083cdfff55a8fdcc82198273afd7dbe6379879':
clarify dp dimension description
James Dong [Fri, 3 Sep 2010 01:24:21 +0000 (18:24 -0700)]
Merge "Calculate audio media drift time from AudioSource" into gingerbread
Scott Main [Fri, 3 Sep 2010 00:53:14 +0000 (17:53 -0700)]
Merge "clarify dp dimension description" into froyo
Dianne Hackborn [Fri, 3 Sep 2010 00:36:37 +0000 (17:36 -0700)]
am
192b56d4: Merge "Implement #
2964234: Add support for <uses-package> element to aapt" into gingerbread
Merge commit '
192b56d42a4f6e5e6c736b0f22dd5bd201b02c9d' into gingerbread-plus-aosp
* commit '
192b56d42a4f6e5e6c736b0f22dd5bd201b02c9d':
Implement #
2964234: Add support for <uses-package> element to aapt
Dianne Hackborn [Fri, 3 Sep 2010 00:34:31 +0000 (17:34 -0700)]
Merge "Implement #
2964234: Add support for <uses-package> element to aapt" into gingerbread
Kenny Root [Thu, 2 Sep 2010 22:48:49 +0000 (15:48 -0700)]
am
2e246549: Merge "Add better debug output for ResourceType errors" into gingerbread
Merge commit '
2e2465497c08061cccf4908e49095f2d19a35eea' into gingerbread-plus-aosp
* commit '
2e2465497c08061cccf4908e49095f2d19a35eea':
Add better debug output for ResourceType errors
Kenny Root [Thu, 2 Sep 2010 22:45:52 +0000 (15:45 -0700)]
Merge "Add better debug output for ResourceType errors" into gingerbread
Gilles Debunne [Thu, 2 Sep 2010 22:34:24 +0000 (15:34 -0700)]
am
d180232e: Merge "Revert "Merge "InputMethodManager showSoftInput return documentation." into gingerbread"" into gingerbread
Merge commit '
d180232e92b78067beb7f84d7f3d1d21865f0594' into gingerbread-plus-aosp
* commit '
d180232e92b78067beb7f84d7f3d1d21865f0594':
Revert "Merge "InputMethodManager showSoftInput return documentation." into gingerbread"
Gilles Debunne [Thu, 2 Sep 2010 22:29:14 +0000 (15:29 -0700)]
Merge "Revert "Merge "InputMethodManager showSoftInput return documentation." into gingerbread"" into gingerbread
Eric Rowe [Thu, 2 Sep 2010 21:59:00 +0000 (14:59 -0700)]
am
947e25e5: am
ac3c1f55: Add BT test instrumentation for reboot tests.
Merge commit '
947e25e5ffe13549dab82580ef05f1f4faf42cd2' into gingerbread-plus-aosp
* commit '
947e25e5ffe13549dab82580ef05f1f4faf42cd2':
Add BT test instrumentation for reboot tests.
Kenny Root [Thu, 2 Sep 2010 21:58:47 +0000 (14:58 -0700)]
Add better debug output for ResourceType errors
An error code is returned as -ESOMETHING, but the debug code was
printing out 0x%08x for these codes making -74 print out as 0xffffffb5
which is kind of silly.
Change-Id: I7d77fb3da2e146845949f121404f662b47288e61
Gilles Debunne [Thu, 2 Sep 2010 21:55:51 +0000 (14:55 -0700)]
am
26d708d9: Merge "InputMethodManager showSoftInput return documentation." into gingerbread
Merge commit '
26d708d93624d2d060529b7e33e0a20172e85efd' into gingerbread-plus-aosp
* commit '
26d708d93624d2d060529b7e33e0a20172e85efd':
InputMethodManager showSoftInput return documentation.
Eric Rowe [Thu, 2 Sep 2010 21:55:47 +0000 (14:55 -0700)]
am
ac3c1f55: Add BT test instrumentation for reboot tests.
Merge commit '
ac3c1f550f30aa793ccf5dcd0da55b070fd55364' into gingerbread
* commit '
ac3c1f550f30aa793ccf5dcd0da55b070fd55364':
Add BT test instrumentation for reboot tests.
Gilles Debunne [Thu, 2 Sep 2010 21:50:25 +0000 (14:50 -0700)]
Merge "InputMethodManager showSoftInput return documentation." into gingerbread
Eric Rowe [Thu, 2 Sep 2010 21:30:45 +0000 (14:30 -0700)]
am
3ac85d31: am
1314219a: (-s ours) DO NOT MERGE Separate utility methods into utility class.
Merge commit '
3ac85d31de6cab5a468b7728b3340cf1b57bc8fe' into gingerbread-plus-aosp
* commit '
3ac85d31de6cab5a468b7728b3340cf1b57bc8fe':
DO NOT MERGE Separate utility methods into utility class.
Eric Rowe [Thu, 2 Sep 2010 21:26:12 +0000 (14:26 -0700)]
am
1314219a: (-s ours) DO NOT MERGE Separate utility methods into utility class.
Merge commit '
1314219a37403594f833c2c71744040ebd8d9b04' into gingerbread
* commit '
1314219a37403594f833c2c71744040ebd8d9b04':
DO NOT MERGE Separate utility methods into utility class.
Daisuke Miyakawa [Thu, 2 Sep 2010 20:54:48 +0000 (13:54 -0700)]
Daisuke Miyakawa [Thu, 2 Sep 2010 20:46:55 +0000 (13:46 -0700)]
am
3bd9b8f0: Fix build breakage.
Merge commit '
3bd9b8f04cece37ab4405abc382e2810006b9f97' into gingerbread-plus-aosp
* commit '
3bd9b8f04cece37ab4405abc382e2810006b9f97':
Fix build breakage.
Daisuke Miyakawa [Thu, 2 Sep 2010 19:59:36 +0000 (12:59 -0700)]
am
b1f5a54a: Merge "VCard refactoring backport." into gingerbread
Merge commit '
b1f5a54a2abd95d03dc96f5f691495d2d7dfadc7' into gingerbread-plus-aosp
* commit '
b1f5a54a2abd95d03dc96f5f691495d2d7dfadc7':
VCard refactoring backport.