OSDN Git Service
Gilles Debunne [Fri, 27 Aug 2010 18:50:26 +0000 (11:50 -0700)]
Merge "DO NOT MERGE Removed "Stop selecting text" option." into gingerbread
Brad Fitzpatrick [Fri, 27 Aug 2010 18:49:31 +0000 (11:49 -0700)]
Merge "Document blocking behavior of ImageView setImageURI and setImageResource" into gingerbread
Mathias Agopian [Fri, 27 Aug 2010 18:47:32 +0000 (11:47 -0700)]
Merge "fix a race in SF buffer management" into gingerbread
Brad Fitzpatrick [Fri, 27 Aug 2010 18:43:56 +0000 (11:43 -0700)]
Document blocking behavior of ImageView setImageURI and setImageResource
Change-Id: I3b0633321229cad80ebf32e052c0db170a56de21
Brad Fitzpatrick [Fri, 27 Aug 2010 18:35:53 +0000 (11:35 -0700)]
am
f5287094: Fix closing tag in docs.
Merge commit '
f52870948d5d57d033fcdafc9c3fb0a872975447' into gingerbread
* commit '
f52870948d5d57d033fcdafc9c3fb0a872975447':
Fix closing tag in docs.
Brad Fitzpatrick [Fri, 27 Aug 2010 18:11:24 +0000 (11:11 -0700)]
Fix closing tag in docs.
BUG=
2956223
Change-Id: I0772d0b5386a783762319064c13d567c124da394
Brad Fitzpatrick [Fri, 27 Aug 2010 18:21:13 +0000 (11:21 -0700)]
Merge "SharedPreferences$Editor.startCommit()" into gingerbread
Gilles Debunne [Fri, 27 Aug 2010 17:49:00 +0000 (10:49 -0700)]
DO NOT MERGE Removed "Stop selecting text" option.
Change-Id: Ic553d099664d1703a39139e7440d583cfec20d76
Gilles Debunne [Fri, 27 Aug 2010 17:33:17 +0000 (10:33 -0700)]
Merge "DO NOT MERGE Text selection: tapping on selection opens context menu" into gingerbread
Gilles Debunne [Fri, 27 Aug 2010 17:32:43 +0000 (10:32 -0700)]
Merge "Fix for 512 limit in assetManager.list" into gingerbread
Gilles Debunne [Thu, 26 Aug 2010 22:51:01 +0000 (15:51 -0700)]
DO NOT MERGE Text selection: tapping on selection opens context menu
Back key exit selection mode. No more "Stop selecting text" in second context menu.
A tap on one of the handles also triggers the second context menu.
Paste is only available on long press in first menu for empty text fields.
Change-Id: Ic4fa00458d4f617a81885436b53d4fc923347609
Brad Fitzpatrick [Thu, 26 Aug 2010 19:04:57 +0000 (12:04 -0700)]
SharedPreferences$Editor.startCommit()
Adds a fire-and-forget save method (startCommit) to the
SharedPreferences.Editor, which is the way most people use it anyway.
This commit adds the implementation. The previous commit added the
interface and docs:
previous change: Idf9934b445da1fb72b79f0192218b47c0a7f5a34
git commit:
edf32d01316bd3432c023f17747461b08ae36375
In addition, this change:
-- adds a generic "runPendingWorkFinishers" mechanism to
ActivityThread to wait on async operations that are still
in flight and use it for this.
-- ties runPendingWorkFinishers into Activity.onPause,
BroadcastReceiver, and Service.
-- makes sSharedPreferences keyed on name, not File, to avoid
unnnecessary allocations
-- documents and guarantees what thread
OnSharedPreferenceChangeListener callbacks run on
-- makes a few things in frameworks/base use startCommit(), notably
Preference.java (which was ignoring the return value anyway)
Change-Id: I1c8db60ad45643226fe6d246d3e513eeb7bd0ebd
Cary Clark [Fri, 27 Aug 2010 15:12:34 +0000 (08:12 -0700)]
Merge "DO NOT MERGE copy selected text on tap" into gingerbread
Brad Fitzpatrick [Fri, 27 Aug 2010 00:54:36 +0000 (17:54 -0700)]
Merge "Fix some bugs in SettingsProvider that I introduced the other day." into gingerbread
Brad Fitzpatrick [Fri, 27 Aug 2010 00:16:14 +0000 (17:16 -0700)]
Fix some bugs in SettingsProvider that I introduced the other day.
BUG=
2953979
Change-Id: Ic9813e0ce629c56050d626ed52de67e6ab1ab07e
Mathias Agopian [Fri, 27 Aug 2010 00:42:27 +0000 (17:42 -0700)]
fix a race in SF buffer management
also remove some unused code.
Change-Id: Iae2c3309b7a08055f3e13a5b866c5c084993e352
Eric Rowe [Fri, 27 Aug 2010 00:30:28 +0000 (17:30 -0700)]
am
163fba0a: Merge "Improve logging and flexibility of BT stress tests." into froyo
Merge commit '
163fba0a75dd582aa62187a062faa66d60db0d34' into gingerbread
* commit '
163fba0a75dd582aa62187a062faa66d60db0d34':
Improve logging and flexibility of BT stress tests.
Eric Rowe [Fri, 27 Aug 2010 00:21:46 +0000 (17:21 -0700)]
Merge "Improve logging and flexibility of BT stress tests." into froyo
Gilles Debunne [Thu, 26 Aug 2010 22:59:54 +0000 (15:59 -0700)]
Fix for 512 limit in assetManager.list
Also replaced all doThrow by jniThrow.
OutOfMemory after string creation were removed: should have been thrown before.
Bug http://b/issue?id=
2949164
Change-Id: Idea8e27fdedeb43e3976776c477766e4dcdebcf8
Eric Rowe [Thu, 26 Aug 2010 22:13:24 +0000 (15:13 -0700)]
Improve logging and flexibility of BT stress tests.
Change-Id: I657638b3b410175919da545e9a9b7d9df6466362
Amith Yamasani [Thu, 26 Aug 2010 01:27:20 +0000 (18:27 -0700)]
Add methods to InputConnection: setComposingRegion() to select a region of text for correction, and getSelectedText()
to return the selected text.
setComposingRegion:
The TextView may choose to highlight the text in some way (underline for now) to indicate
that the text is selected for correction, if the IME wants to provider alternatives.
Choosing an alternative in the IME can then call IC.commitText() to replace the highlighted
(not selected) text with a different candidate.
This change also ensures that any existing spans/styles are not wiped out. So we can now
correct rich text as well.
getSelectedText:
This is a convenience to get the selected text instead of using extracted text that is
more heavy weight. Existing getTextBeforeCursor() and getTextAfterCursor() fail to
retrieve the selected text, only what's before and after the selection.
Change-Id: Ieb5ecd5ff947ea04958589f501e7bd5228e00fb5
David Brown [Tue, 24 Aug 2010 00:40:51 +0000 (17:40 -0700)]
Add SipAddress to ContactsContract.
This is a new data kind representing a SIP address for a contact.
The new class is ContactsContract.CommonDataKinds.SipAddress,
and the new mime type is "vnd.android.cursor.item/sip_address".
It's pretty generic right now (basically a single text field, like
"Website") but we may eventually want to extend it later to have multiple
labels+types (like phone numbers.)
Bug:
2942998
Change-Id: I45d90a680a3badf60bccb5aafdc2397037494e95
Dianne Hackborn [Thu, 26 Aug 2010 21:18:37 +0000 (14:18 -0700)]
Hide heavy-weight API.
And give it a better name, for when it is later un-hidden.
Change-Id: Iae0d3054d44f873b9f953bc41d175a47802a185e
Cary Clark [Thu, 26 Aug 2010 21:36:01 +0000 (17:36 -0400)]
DO NOT MERGE copy selected text on tap
Change-Id: I4175a3e66cda7f26353fbbd98e65639fd91b2bb9
http://b/
2626451
Joe Onorato [Thu, 26 Aug 2010 20:54:13 +0000 (13:54 -0700)]
Merge "Need to close the windowshade on ACTION_CLOSE_SYSTEM_DIALOGS and ACTION_SCREEN_OFF." into gingerbread
Joe Onorato [Thu, 26 Aug 2010 20:52:26 +0000 (16:52 -0400)]
Need to close the windowshade on ACTION_CLOSE_SYSTEM_DIALOGS and ACTION_SCREEN_OFF.
Bug:
2827958
Change-Id: I1f9467a2a80fdc1d004a678327a47e7bc8917a18
Andreas Huber [Thu, 26 Aug 2010 20:47:16 +0000 (13:47 -0700)]
Merge "Support for RTP packets arriving interleaved with RTSP responses." into gingerbread
Cary Clark [Thu, 26 Aug 2010 19:04:51 +0000 (12:04 -0700)]
Merge "DO NOT MERGE -- copy on tapping outside of selected text in gmail" into gingerbread
Joe Onorato [Thu, 26 Aug 2010 19:02:51 +0000 (12:02 -0700)]
am
797e688b: Continue trying to make the turn off quickly after call feature work.
Merge commit '
797e688b3bebbf1f50a8ad08528740b064f79153' into gingerbread
* commit '
797e688b3bebbf1f50a8ad08528740b064f79153':
Continue trying to make the turn off quickly after call feature work.
Cary Clark [Thu, 26 Aug 2010 18:35:44 +0000 (14:35 -0400)]
DO NOT MERGE -- copy on tapping outside of selected text in gmail
Text can be selected in gmail by choosing Select Text from the
menu and dragging the selection. There's no pretend action bar
like there is in the Browser to commit the selection.
When tapping outside of the selection, copy the text, if
the client (like gmail) has mapped the trackball to the
arrow keys.
Change-Id: I7dd133fd860d392bb01ec103e379e1f1d2a43e64
http://b/
2626451
Joe Onorato [Thu, 26 Aug 2010 18:50:31 +0000 (11:50 -0700)]
Merge "Just disable widgets that come from apps on sd cards, because they don't work anyway." into gingerbread
Joe Onorato [Thu, 26 Aug 2010 18:50:28 +0000 (11:50 -0700)]
Merge "Fix typo that makes apps on sd work better with app widgets." into gingerbread
Joe Onorato [Thu, 26 Aug 2010 18:46:01 +0000 (14:46 -0400)]
Continue trying to make the turn off quickly after call feature work.
The previous implementation worked if the set timeout is short enough, which mine was. This one
carries the remaining amount of timeout override forward through all of the countdown steps.
Bug:
2844990
Change-Id: I040df22f9f9ddf98c355ac6845b7624e95f84f33
Andreas Huber [Thu, 26 Aug 2010 18:17:32 +0000 (11:17 -0700)]
Support for RTP packets arriving interleaved with RTSP responses.
Change-Id: Ib32fba257da32a199134cf8943117cf3eaa07a25
Gilles Debunne [Thu, 26 Aug 2010 18:09:10 +0000 (11:09 -0700)]
Fix for IndexOutOfBounds in TextView getWordLimitsAt.
Bug http://b/issue?id=
2948904
Change-Id: I10008374da92d5a98ec567cc76732383e66c4c5b
Eric Laurent [Thu, 26 Aug 2010 18:01:06 +0000 (11:01 -0700)]
Merge "Changed type of reverb presets from int to short" into gingerbread
Gilles Debunne [Thu, 26 Aug 2010 17:58:58 +0000 (10:58 -0700)]
Merge "Fix for NPE in TextView." into gingerbread
Guang Zhu [Thu, 26 Aug 2010 17:49:19 +0000 (10:49 -0700)]
Merge "add mouse up/down/click support in DumpRenderTree" into gingerbread
Dianne Hackborn [Thu, 26 Aug 2010 17:47:48 +0000 (10:47 -0700)]
Merge "Fix issue #
2951784: Launcher crashes on startup" into gingerbread
Eric Laurent [Thu, 26 Aug 2010 17:38:24 +0000 (10:38 -0700)]
Changed type of reverb presets from int to short
Changed the type of reverb preset constants exposed by the PresetReverb API to
match the type of the setPreset() method parameter.
Change-Id: I786764b5279c60f2368f5a0372f78da65ec54e4f
Dianne Hackborn [Thu, 26 Aug 2010 17:20:01 +0000 (10:20 -0700)]
Fix issue #
2951784: Launcher crashes on startup
Change-Id: I98aedacce9a7d6b8bc168f39ea5489b40dc0ec8d
Eric Laurent [Thu, 26 Aug 2010 17:16:26 +0000 (10:16 -0700)]
Merge "Added automated tests for reverb audio effect." into gingerbread
James Dong [Thu, 26 Aug 2010 16:47:12 +0000 (09:47 -0700)]
Merge "Make sure that timestamp does not go backward in MP4 file writer" into gingerbread
Eric Laurent [Tue, 24 Aug 2010 16:56:45 +0000 (09:56 -0700)]
Added automated tests for reverb audio effect.
- Added tests for preset and environmental reverb to functional media frame work tests.
- created a new class for energy probing used by all audio effect tests and corrected energy calculation.
Change-Id: Ib8109e70020176a87538309eb028109b81b93dde
satok [Thu, 26 Aug 2010 12:53:41 +0000 (21:53 +0900)]
DO NOT MERGE. Backport master InputMethodManagerService.java to gingerbread
Change-Id: Ied15b4f2f447ee3e3b858d4ca65c21c30dfa4eba
Chung-yih Wang [Thu, 26 Aug 2010 07:05:48 +0000 (15:05 +0800)]
Add Wifi High Perf. mode during a call.
To prevent the wifi from entering low-power mode due to the screen off
triggered by the proximity sensor.
Change-Id: I490bc594d800bc30c256e52ef3bce08bf86bc7b1
Dianne Hackborn [Thu, 26 Aug 2010 05:00:28 +0000 (22:00 -0700)]
Merge "Don't retain global ref to last inflated context." into gingerbread
Dianne Hackborn [Thu, 26 Aug 2010 02:50:20 +0000 (19:50 -0700)]
Don't retain global ref to last inflated context.
Also rework URI permission granting to support upcoming
clipboard use.
Change-Id: I9842920350955531c5a511c2ecc5215e8c783343
Chia-chi Yeh [Thu, 26 Aug 2010 02:43:58 +0000 (19:43 -0700)]
Merge "Revert "RTP: integrate the echo canceller from speex."" into gingerbread
Chia-chi Yeh [Thu, 26 Aug 2010 02:33:09 +0000 (10:33 +0800)]
Revert "RTP: integrate the echo canceller from speex."
This reverts commit
4ae6ec428f3570b9020b35ada6a62f94af66d888.
Hung-ying Tyan [Thu, 26 Aug 2010 02:27:50 +0000 (19:27 -0700)]
Merge "CallManager: remove unused Phone argument from stopDtmf() and sendBurstDtmf()" into gingerbread
Chung-yih Wang [Thu, 26 Aug 2010 02:25:02 +0000 (19:25 -0700)]
Merge "Add dynamic uid info for tracking the sip service usage." into gingerbread
Gilles Debunne [Thu, 26 Aug 2010 02:13:48 +0000 (19:13 -0700)]
Fix for NPE in TextView.
Bug http://b/issue?id=
2941549
Change-Id: Id5cbf0a3b2b68f450a9271333b96d41b01aa9f5c
Chung-yih Wang [Wed, 25 Aug 2010 11:02:18 +0000 (19:02 +0800)]
Add dynamic uid info for tracking the sip service usage.
Change-Id: Ibc340401b63799326b08aee6eba602a3e753b13f
Guang Zhu [Fri, 20 Aug 2010 23:00:04 +0000 (16:00 -0700)]
add mouse up/down/click support in DumpRenderTree
use touchStart/End when mouseDown/Up is called in current
EventSender implmentation.
Change-Id: Iff3e7f45b6a7170d9be1c7ec9b12a74a74737732
Konstantin Lopyrev [Thu, 26 Aug 2010 00:35:50 +0000 (17:35 -0700)]
Merge "Preventing the hierarchy viewer from getting stuck, once when trying to load the window data for SurfaceView and the Wallpaper, and in the case the captured node has disappeared." into gingerbread
Romain Guy [Thu, 26 Aug 2010 00:26:20 +0000 (17:26 -0700)]
Merge "reserve android.opengl.GLWallpaperService name for future use" into gingerbread
Kenny Root [Thu, 26 Aug 2010 00:20:29 +0000 (17:20 -0700)]
Merge "Add LFH offset to verbose list of APK" into gingerbread
Mathias Agopian [Wed, 25 Aug 2010 23:42:24 +0000 (16:42 -0700)]
reserve android.opengl.GLWallpaperService name for future use
Change-Id: I7a217593a1ca39214dda26ddb3af3ddc30a8a95a
Dianne Hackborn [Wed, 25 Aug 2010 23:31:34 +0000 (16:31 -0700)]
Merge "Fix a fun bug with multiple service bindings from an activity." into gingerbread
Mathias Agopian [Wed, 25 Aug 2010 23:03:58 +0000 (16:03 -0700)]
Merge "Improve Sensors documentation a bit" into gingerbread
Andreas Huber [Wed, 25 Aug 2010 22:35:53 +0000 (15:35 -0700)]
Merge "Fix support for per-frame unsynchronization in ID3V2.4 tags." into gingerbread
Mathias Agopian [Wed, 25 Aug 2010 22:25:32 +0000 (15:25 -0700)]
Merge "fix [
2946787] Screen flicker on low resolution setting in camcorder." into gingerbread
Brad Fitzpatrick [Wed, 25 Aug 2010 22:15:30 +0000 (15:15 -0700)]
Merge "Start of SharedPreferences$Editor.startCommit()" into gingerbread
Mathias Agopian [Wed, 25 Aug 2010 21:59:15 +0000 (14:59 -0700)]
fix [
2946787] Screen flicker on low resolution setting in camcorder.
Change-Id: I7e86f2b6d85dcae8dd212890b978fa6ac7de6893
Dianne Hackborn [Wed, 25 Aug 2010 22:06:25 +0000 (15:06 -0700)]
Fix a fun bug with multiple service bindings from an activity.
There was a flaw in the service management, when the same activity
is doing a bindService() for the same service IBinder. In this case
the activity would correctly keep a list of all generated connections,
however some other data structures would assume there is only one
connection per IBinder, and thus only remember the last.
When that last connection was unbound, the service would be destroyed
since it thought there were no more connections. Then when the
activity was finished, it would try to destroy the service again and
end up with an ANR because the service was already gone and would
not respond.
Change-Id: I59bde38bc24e78147b90b0a7cd525c2a1d20489f
Eric Laurent [Wed, 25 Aug 2010 22:09:10 +0000 (15:09 -0700)]
Merge "Added preset reverb." into gingerbread
Andreas Huber [Wed, 25 Aug 2010 21:55:53 +0000 (14:55 -0700)]
Fix support for per-frame unsynchronization in ID3V2.4 tags.
Change-Id: I6874b596f88817347756a375d9fb1c9bff418eca
related-to-bug:
2949149
Andreas Huber [Wed, 25 Aug 2010 21:54:36 +0000 (14:54 -0700)]
Merge "Ensure that buffering updates eventually hit 100% after we download everything." into gingerbread
Mathias Agopian [Wed, 25 Aug 2010 21:35:54 +0000 (14:35 -0700)]
Improve Sensors documentation a bit
Change-Id: I6f4f9ebfaf1e7f461a795f717b9913e3a021e9d4
Konstantin Lopyrev [Wed, 25 Aug 2010 05:00:12 +0000 (22:00 -0700)]
Preventing the hierarchy viewer from getting stuck, once when trying to load the window data for SurfaceView and the Wallpaper, and in the case the captured node has disappeared.
Change-Id: Iaff6bd501a2bb3faa7a394fff740479f6a95e899
Cary Clark [Wed, 25 Aug 2010 20:22:15 +0000 (16:22 -0400)]
DO NOT MERGE fix null check
Check to see if the WebChromeClient is null.
Checked into master in change 63008
Change-Id: If2ef1889ce3633c0b35c078a46bde84982dd1eb3
http://b/
2945171
Brad Fitzpatrick [Wed, 25 Aug 2010 20:13:36 +0000 (13:13 -0700)]
Start of SharedPreferences$Editor.startCommit()
No implementation yet, just the interface.
Change-Id: Idf9934b445da1fb72b79f0192218b47c0a7f5a34
Andreas Huber [Wed, 25 Aug 2010 20:10:04 +0000 (13:10 -0700)]
Merge "Allow sniffers to return a packet of opaque data that the corresponding extractor can take advantage of to not duplicate work already done sniffing. The mp3 extractor takes advantage of this now." into gingerbread
Andreas Huber [Wed, 25 Aug 2010 18:09:41 +0000 (11:09 -0700)]
Allow sniffers to return a packet of opaque data that the corresponding extractor can take advantage of to not duplicate work already done sniffing. The mp3 extractor takes advantage of this now.
Change-Id: Icb77ae3ee95a69c7da25b4d3b8696c0a2d33028a
related-to-bug:
2948754
Andreas Huber [Wed, 25 Aug 2010 19:31:48 +0000 (12:31 -0700)]
Ensure that buffering updates eventually hit 100% after we download everything.
Change-Id: I43bb85b1128fa9c1bc8632970d7101006393bcc8
related-to-bug:
2844095
Mathias Agopian [Wed, 25 Aug 2010 19:15:38 +0000 (12:15 -0700)]
Merge "don't try to lock a buffer that wasn't allocated with SW usage bits" into gingerbread
Mathias Agopian [Fri, 20 Aug 2010 22:59:53 +0000 (15:59 -0700)]
don't try to lock a buffer that wasn't allocated with SW usage bits
Change-Id: Iabbcec1bfa30dc47d45ece699dd178653f1b675b
Brian Carlstrom [Wed, 25 Aug 2010 18:02:22 +0000 (11:02 -0700)]
Merge "Remove "StringTest.java"." into gingerbread
Brian Carlstrom [Wed, 25 Aug 2010 17:53:10 +0000 (10:53 -0700)]
Merge "Update AndroidRuntime with dalvik-dev changes" into gingerbread
Eric Laurent [Wed, 25 Aug 2010 17:37:27 +0000 (10:37 -0700)]
Merge "Fix the simulator build." into gingerbread
Jean-Baptiste Queru [Wed, 25 Aug 2010 17:15:38 +0000 (10:15 -0700)]
am
d5e601c2: reconcile open-source froyo into google variant
Merge commit '
d5e601c2304610085e3d7a276c4bbcd984ac89f9' into gingerbread
* commit '
d5e601c2304610085e3d7a276c4bbcd984ac89f9':
Make the default backup configuration "disabled; local transport selected"
Eric Laurent [Wed, 25 Aug 2010 17:00:53 +0000 (10:00 -0700)]
Fix the simulator build.
Fixes the sim build broken by commit
58d3bd08107f44cba79938dd8430e69c0fda4202.
Change-Id: I5a63623363d558783dc5254fdd322080cc2f3525
Jean-Baptiste Queru [Wed, 25 Aug 2010 16:38:48 +0000 (09:38 -0700)]
reconcile open-source froyo into google variant
Change-Id: Idfacbf98a6c98176620f252504213d01bbd49eb9
Brian Carlstrom [Wed, 25 Aug 2010 16:28:00 +0000 (09:28 -0700)]
Merge "Fix linux 64 build" into gingerbread
Christopher Tate [Tue, 24 Aug 2010 22:37:42 +0000 (15:37 -0700)]
Make the default backup configuration "disabled; local transport selected"
By default out of the box, an Android build will have the backup mechanism in
its "disabled" state and pointed to the LocalTransport test transport. We
do not want retail devices built without the Google backend to have backup
enabled out of the box; it would cause them to gradually grind away the
cache partition for no good reason. On those devices with this change,
developers would need to enable backup manually (possibly using the normal
Settings UI; more probably using the 'bmgr' shell tool), but would no longer
also have to manually configure the active transport name.
Device vendors producing Google-enabled products will simply use resource
overlays to configure the default state and transport name for their builds.
When building a product that points to the Google backup transport by default,
the "def_backup_enabled" boolean resource should still be set to 'false' --
the Google backup disclosure activity supplied by GSF will take care of
enabling the backup services if the user opts in to it. (Basically, vendors
will never have to overlay the def_backup_enabled resource -- the default
value of 'false' is correct for any retail device regardless of whether it
can use the Google backup transport.)
In the SDK build, the default transport will remain the local one, but
the default enable state overridden and set to "true". This is the ideal
situation for developers: all aspects of the backup mechanism immediately
operative with no manual configuration needed.
Change-Id: I866f8f627b023b338bc7757e61604e6d8a901a34
Kenny Root [Wed, 25 Aug 2010 14:36:31 +0000 (07:36 -0700)]
Add LFH offset to verbose list of APK
The Local File Header (LFH) offset is printed in debugging cases when
the platform is inspecting APKs. This adds the LFH offset field to the
list of contents of an APK, so that it can be checked easily against the
Central Directory (CD).
Change-Id: I08f9a13256bfe6563c1a963c4f0289789b2e7857
Hung-ying Tyan [Wed, 25 Aug 2010 10:18:15 +0000 (18:18 +0800)]
CallManager: remove unused Phone argument from stopDtmf() and sendBurstDtmf()
Change-Id: Ib0c83c373580f7be9cb1ee262cd0098c70db9c64
Chih-Chung Chang [Wed, 25 Aug 2010 07:07:23 +0000 (00:07 -0700)]
Merge "Avoid allocating buffer every time getThumbnail is called." into gingerbread
Hung-ying Tyan [Wed, 25 Aug 2010 06:57:50 +0000 (23:57 -0700)]
Merge "SipProfile: add isOutgoingCallAllowed() and new builder constructor" into gingerbread
Chih-Chung Chang [Tue, 24 Aug 2010 11:25:56 +0000 (19:25 +0800)]
Avoid allocating buffer every time getThumbnail is called.
Change-Id: Ia088539463e26a1242064ed7e79b0b2c12d64ced
Rohit Mungee [Wed, 25 Aug 2010 05:59:41 +0000 (22:59 -0700)]
Merge "Add support for generated documentation as part of the SDK docs." into gingerbread
Bill Napier [Wed, 25 Aug 2010 05:18:21 +0000 (22:18 -0700)]
Add support for generated documentation as part of the SDK docs.
This can be done by adding the list of files to include to the
ALL_GENERATED_DOCS variable, and then making sure to put your generated output
files under $(OUT_DOCS)/gen.
Change-Id: Ie068a3fadccf7c990ec8e26b92ad408e7314469e
Brian Carlstrom [Wed, 25 Aug 2010 04:27:52 +0000 (21:27 -0700)]
Update AndroidRuntime with dalvik-dev changes
This change is the result of three cherry-picks:
- Add dalvik.vm.gc.preverify dalvik.vm.gc.postverify properties.
git cherry-pick --no-commit
0ef82fcf
- Add the property dalvik.vm.gc.verifycardtable to set the -Xgc:-Xgc:verifycardtable option for the vm.
git cherry-pick --no-commit
8b4faf54
- Eliminate short JIT debugging properties
git cherry-pick --no-commit
57a673fc3db9d84908467ae6d245fd60d4637b2f
Change-Id: I5f8002ed1e431344570add02f58e2641c8fae549
Brian Carlstrom [Wed, 25 Aug 2010 03:33:55 +0000 (20:33 -0700)]
Remove "StringTest.java".
This only tests stuff that's already better tested in dalvik/libcore, plus
private ICU API (RuleBasedNumberFormat) we'd like to remove, and that this
is the only caller of.
Conflicts:
tests/CoreTests/android/core/StringTest.java
git cherry-pick -e
935022a99dac5454fc478e221b6392f3ba467009
Change-Id: I0bd172f2703bbcd6381920d40244165234fef4a1
Brian Carlstrom [Wed, 25 Aug 2010 03:20:50 +0000 (20:20 -0700)]
Fix linux 64 build
git cherry-pick -e
49416bc658e37a0f4ae4f2b7b8582dd1606fba0f
Change-Id: I37a689acea8aeb5d6ac92ee56b077bafe4fba170
Daisuke Miyakawa [Wed, 25 Aug 2010 01:29:24 +0000 (18:29 -0700)]
Merge "Fix the test breakage in vCard tests." into gingerbread
Daisuke Miyakawa [Wed, 25 Aug 2010 01:26:45 +0000 (18:26 -0700)]
Fix the test breakage in vCard tests.
- Make custom resolvers use official MockContentProvider instead of
relying on its own.
- Fix a test which is found to be broken after the fix above.
Bug:
2945326
Change-Id: Ifb14f61771215c103d8825240989eecee73d585a
Christopher Tate [Wed, 25 Aug 2010 01:21:39 +0000 (18:21 -0700)]
am
02e18d4d: Merge "Make the default backup configuration "disabled; local transport selected"" into froyo
Merge commit '
02e18d4d4eed949da02fd8aa87801858d99b902a' into gingerbread
* commit '
02e18d4d4eed949da02fd8aa87801858d99b902a':
Make the default backup configuration "disabled; local transport selected"
Brad Fitzpatrick [Wed, 25 Aug 2010 01:10:36 +0000 (18:10 -0700)]
Merge "Negatively cache settings and proactively slurp settings into cache." into gingerbread