Wei-Ta Chen
731e3428fb
Merge "Revert "Rename LargeBitmap to BitmapRegionDecoder for having a better API."" into gingerbread
2010-09-07 20:36:13 -07:00
Brad Fitzpatrick
9a994a0796
Merge "Fix a race between requesting/loading/writing SharedPreferences." into gingerbread
2010-09-07 20:06:26 -07:00
Hung-ying Tyan
3386566558
Merge "SipPhone: switch to its own phone type PHONE_TYPE_SIP." into gingerbread
2010-09-07 19:37:33 -07:00
Kenny Root
dc2d840ff7
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.
2010-09-07 19:30:22 -07:00
Gilles Debunne
cfaf307ec5
Merge "Hide mCursorController field in ArrowKeyMovementMethod." into gingerbread
2010-09-07 18:53:55 -07:00
Dmitry Shmidt
f0b9cf3d6a
Merge "Rename SETSUSPEND to SETSUSPENDOPT DO NOT MERGE" into gingerbread
2010-09-07 17:29:45 -07:00
Wei-Ta Chen
4211ee8c3b
Merge "Rename LargeBitmap to BitmapRegionDecoder for having a better API." into gingerbread
2010-09-07 17:01:57 -07:00
Dianne Hackborn
9556ef4f84
Merge "Modify native ALooper to take an explicit ident." into gingerbread
2010-09-07 16:32:48 -07:00
Dianne Hackborn
45e0acb41a
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
2010-09-07 15:46:55 -07:00
Kenny Root
dc3f166282
Merge "Allow installd to handle large partitions" into gingerbread
2010-09-07 15:38:31 -07:00
Elliott Hughes
6334b1860b
Merge "Be brief." into gingerbread
2010-09-07 14:41:36 -07:00
Joe Onorato
df67235b0f
Merge "Expose the TextAppearance.StatusBar.* styles." into gingerbread
2010-09-07 14:41:12 -07:00
Makoto Onuki
32d9abcdc1
Merge "Don't fall through from TOKEN_EMAIL_LOOKUP" into gingerbread
2010-09-07 14:31:34 -07:00
Dianne Hackborn
dd5572047a
Merge "Fixes to battery stats debug output." into gingerbread
2010-09-07 14:10:38 -07:00
Dianne Hackborn
bb39b9f17b
Hopefully fix the build.
...
Change-Id: Id8cd92c0895c9939e1386ef488bd1309a3be3568
2010-09-07 12:32:19 -07:00
Dianne Hackborn
bd89ff87d2
Merge "Add system property to turn off scheduling groups." into gingerbread
2010-09-07 11:27:26 -07:00
Dianne Hackborn
7b0d45c346
Add system property to turn off scheduling groups.
...
Do this:
adb shell setprop debug.sys.noschedgroups 1
Change-Id: I6e06a74205fd45ee1526ce71fe33944465d39984
2010-09-07 11:19:11 -07:00
Joe Onorato
5ad6c91cef
Merge "When notifications are updated, don't re-show the ticker unless the text has changed." into gingerbread
2010-09-07 11:14:56 -07:00
Brad Fitzpatrick
df9177bc18
Merge "Make SharedPreferencesBackupHelper wait for async SharedPreference writes" into gingerbread
2010-09-07 11:12:51 -07:00
Eric Fischer
5987f041e5
Merge "Preserve old translations for changed strings. DO NOT MERGE" into gingerbread
2010-09-07 11:03:26 -07:00
Kenny Root
a25be22632
Merge "Use new nativeLibraryPath field for NativeActivity" into gingerbread
2010-09-07 10:46:14 -07:00
Hung-ying Tyan
60382f0550
Merge "SipService: unset session listener if listener is gone." into gingerbread
2010-09-06 20:13:32 -07:00
Kenny Root
3c662bdb06
Merge "Reduce footprint of Signature from ~7000 to ~1448" into gingerbread
2010-09-03 16:59:42 -07:00
Eric Laurent
498805a4ec
Merge "LVM release 1.08 delivery." into gingerbread
2010-09-03 16:35:54 -07:00
James Dong
2e536e822b
Merge "Not all audio source has the drift time information" into gingerbread
2010-09-03 15:42:09 -07:00
Dianne Hackborn
38e036340e
Merge "Improve doc." into gingerbread
2010-09-03 15:15:50 -07:00
Dianne Hackborn
09a6cc531f
Merge "Adding a feature denoting support for 5 or more fully independent multitouch pointers." into gingerbread
2010-09-03 15:07:17 -07:00
John Wang
13fbcd286d
Merge "Add API to get all foreground calls." into gingerbread
2010-09-03 14:06:20 -07:00
Adam Powell
1ec6b4c64c
Merge "Fix bug 2973252 - Make overscroll glow respect ifContentScrolls" into gingerbread
2010-09-03 13:58:37 -07:00
Andreas Huber
ce072e2e22
Merge "Properly buffer a certain amount of data on streaming sources before finishing prepare()." into gingerbread
2010-09-03 13:46:02 -07:00
Dianne Hackborn
5f6716c9d9
Merge "These are not ready to be exposed. Also rename them to be better." into gingerbread
2010-09-03 13:24:33 -07:00
Scott Main
80d32d71b4
am c4367e54: fix code snippet error
...
Merge commit 'c4367e54e41f4e7a6c79b60dd80e66c9e6fdcfc3' into gingerbread
* commit 'c4367e54e41f4e7a6c79b60dd80e66c9e6fdcfc3':
fix code snippet error
2010-09-03 13:15:11 -07:00
Brad Fitzpatrick
962f3a99d0
Merge "More SharedPreferences commit() -> apply() changes." into gingerbread
2010-09-03 12:46:25 -07:00
James Dong
bfa80e1fed
Merge "Better file size estimate" into gingerbread
2010-09-03 09:53:13 -07:00
Hung-ying Tyan
7657059cd1
Merge "SipManager: always return true for SIP API and VOIP support query." into gingerbread
2010-09-02 19:23:31 -07:00
Scott Main
bcd7841079
am c5083cdf: Merge "clarify dp dimension description" into froyo
...
Merge commit 'c5083cdfff55a8fdcc82198273afd7dbe6379879' into gingerbread
* commit 'c5083cdfff55a8fdcc82198273afd7dbe6379879':
clarify dp dimension description
2010-09-02 18:30:16 -07:00
James Dong
c0bb8874ee
Merge "Calculate audio media drift time from AudioSource" into gingerbread
2010-09-02 18:24:21 -07:00
Scott Main
1b8629d5ca
Merge "clarify dp dimension description" into froyo
2010-09-02 17:53:14 -07:00
Dianne Hackborn
8bc525616e
Merge "Implement #2964234 : Add support for <uses-package> element to aapt" into gingerbread
2010-09-02 17:34:31 -07:00
Kenny Root
6dfd218f7e
Merge "Add better debug output for ResourceType errors" into gingerbread
2010-09-02 15:45:52 -07:00
Gilles Debunne
f1fa4addc5
Merge "Revert "Merge "InputMethodManager showSoftInput return documentation." into gingerbread"" into gingerbread
2010-09-02 15:29:14 -07:00
Kenny Root
45162448b3
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
2010-09-02 14:58:47 -07:00
Eric Rowe
2c3659c42a
am ac3c1f55: Add BT test instrumentation for reboot tests.
...
Merge commit 'ac3c1f550f30aa793ccf5dcd0da55b070fd55364' into gingerbread
* commit 'ac3c1f550f30aa793ccf5dcd0da55b070fd55364':
Add BT test instrumentation for reboot tests.
2010-09-02 14:55:47 -07:00
Gilles Debunne
3d71a05eb6
Merge "InputMethodManager showSoftInput return documentation." into gingerbread
2010-09-02 14:50:25 -07:00
Eric Rowe
1ff3da4341
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.
2010-09-02 14:26:12 -07:00
Daisuke Miyakawa
3fb3a4fbd0
Merge "VCard refactoring backport." into gingerbread
2010-09-02 12:56:15 -07:00
Eric Laurent
a92ce71cf9
Merge "Fix problem in AudioEffect::command() status." into gingerbread
2010-09-02 12:46:24 -07:00
Eric Rowe
a9e23b3b62
Merge "DO NOT MERGE Separate utility methods into utility class." into gingerbread
2010-09-02 11:35:20 -07:00
Chia-chi Yeh
d4d7550d22
Merge "SipService: reduce the usage of javax.sdp.*." into gingerbread
2010-09-02 08:13:01 -07:00
Adam Powell
1b7a93030c
Merge "DO NOT MERGE Overscroll continues; asset and behavior tweaks." into gingerbread
2010-09-02 00:28:14 -07:00