24708 Commits

Author SHA1 Message Date
Cary Clark
d64f4a983d 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
2010-08-25 16:22:15 -04:00
Andreas Huber
b8814dce28 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 2010-08-25 13:10:04 -07:00
Andreas Huber
efdd088a71 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
2010-08-25 13:08:38 -07:00
Mathias Agopian
8eb16af293 Merge "don't try to lock a buffer that wasn't allocated with SW usage bits" into gingerbread 2010-08-25 12:15:38 -07:00
Mathias Agopian
c817b22055 don't try to lock a buffer that wasn't allocated with SW usage bits
Change-Id: Iabbcec1bfa30dc47d45ece699dd178653f1b675b
2010-08-25 12:14:27 -07:00
Brian Carlstrom
4d672988fe Merge "Remove "StringTest.java"." into gingerbread 2010-08-25 11:02:22 -07:00
Brian Carlstrom
24bf70cac0 Merge "Update AndroidRuntime with dalvik-dev changes" into gingerbread 2010-08-25 10:53:10 -07:00
Eric Laurent
67b506065e Merge "Fix the simulator build." into gingerbread 2010-08-25 10:37:27 -07:00
Jean-Baptiste Queru
7e2f87fafa 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"
2010-08-25 10:15:38 -07:00
Eric Laurent
cd295c11ab Fix the simulator build.
Fixes the sim build broken by commit 58d3bd08107f44cba79938dd8430e69c0fda4202.

Change-Id: I5a63623363d558783dc5254fdd322080cc2f3525
2010-08-25 10:00:53 -07:00
Jean-Baptiste Queru
d5e601c230 reconcile open-source froyo into google variant
Change-Id: Idfacbf98a6c98176620f252504213d01bbd49eb9
2010-08-25 09:40:59 -07:00
Brian Carlstrom
59073b155a Merge "Fix linux 64 build" into gingerbread 2010-08-25 09:28:00 -07:00
Christopher Tate
9d3fa5764c 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
2010-08-25 08:27:40 -07:00
Chih-Chung Chang
231a000565 Merge "Avoid allocating buffer every time getThumbnail is called." into gingerbread 2010-08-25 00:07:23 -07:00
Hung-ying Tyan
37f709aeb0 Merge "SipProfile: add isOutgoingCallAllowed() and new builder constructor" into gingerbread 2010-08-24 23:57:50 -07:00
Chih-Chung Chang
2ca36196ea Avoid allocating buffer every time getThumbnail is called.
Change-Id: Ia088539463e26a1242064ed7e79b0b2c12d64ced
2010-08-25 14:52:30 +08:00
Rohit Mungee
bfc9325f89 Merge "Add support for generated documentation as part of the SDK docs." into gingerbread 2010-08-24 22:59:41 -07:00
Bill Napier
e0dacf93b1 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
2010-08-24 22:18:54 -07:00
Brian Carlstrom
171ea89fb9 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
2010-08-24 21:27:52 -07:00
Brian Carlstrom
5c8e760bcb 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
2010-08-24 21:04:25 -07:00
Brian Carlstrom
74b58fc58b Fix linux 64 build
git cherry-pick -e 49416bc658e37a0f4ae4f2b7b8582dd1606fba0f

Change-Id: I37a689acea8aeb5d6ac92ee56b077bafe4fba170
2010-08-24 20:20:50 -07:00
Daisuke Miyakawa
d0ad67ad84 Merge "Fix the test breakage in vCard tests." into gingerbread 2010-08-24 18:29:24 -07:00
Daisuke Miyakawa
4d9c1931c9 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
2010-08-24 18:26:45 -07:00
Christopher Tate
2b81d6dd8a 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"
2010-08-24 18:21:39 -07:00
Brad Fitzpatrick
bb0eb5ca84 Merge "Negatively cache settings and proactively slurp settings into cache." into gingerbread 2010-08-24 18:10:36 -07:00
Brad Fitzpatrick
f366a9b007 Negatively cache settings and proactively slurp settings into cache.
The settings database cache is tiny (or should be tiny) and can be
slurped into memory.  Once it's in memory and we know we have it all
we can avoid going to disk at all for keys not in the cache.

This is a big percentage of the StrictMode violations & latency.

Change-Id: I649411be0c40d348f58376ccfb3eda059fd69fbc
2010-08-24 18:07:33 -07:00
Christopher Tate
02e18d4d4e Merge "Make the default backup configuration "disabled; local transport selected"" into froyo 2010-08-24 18:05:09 -07:00
Christopher Tate
09dedc998f 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
2010-08-24 17:52:45 -07:00
Mathias Agopian
8395b4625b Merge "fix [2931513] Add support for setting the orientation of an ANativeWindow" into gingerbread 2010-08-24 16:23:12 -07:00
Mathias Agopian
e96aa3e859 fix [2931513] Add support for setting the orientation of an ANativeWindow
Also implement support for cropping.

Change-Id: Iba5888dd242bf2feaac9e9ce26e404c1f404c280
2010-08-24 15:40:50 -07:00
Andreas Huber
6b6ae996b2 Merge "A first shot at proper support for seeking of rtsp streams." into gingerbread 2010-08-24 15:01:14 -07:00
Dianne Hackborn
4af0cfad53 Merge "Verify that onPause() calls its superclass." into gingerbread 2010-08-24 14:44:42 -07:00
Andreas Huber
e0dd7d3960 A first shot at proper support for seeking of rtsp streams.
Change-Id: I9604f2d09feedc0074c0e715be58e719d4483760
related-to-bug: 2556656
2010-08-24 14:33:58 -07:00
Gilles Debunne
e2978c8dca Merge "Fix for an NPE in TextView." into gingerbread 2010-08-24 14:23:37 -07:00
Gilles Debunne
4e765e002f Fix for an NPE in TextView.
Change-Id: I0fca8f839cd444d9b70174078063efff5be499a3
2010-08-24 14:21:13 -07:00
Brad Fitzpatrick
b1bbe99aaa Merge "Some StrictMode API changes." into gingerbread 2010-08-24 14:15:30 -07:00
Daisuke Miyakawa
88bff62c35 Merge "Fix vCard so that it looks at IM correctly." into gingerbread 2010-08-24 13:37:02 -07:00
Daisuke Miyakawa
6dd19ca5cb Merge "Make VCardTestsBase public." into gingerbread 2010-08-24 13:36:43 -07:00
Daisuke Miyakawa
4a2a2eb4cb Fix vCard so that it looks at IM correctly.
Change-Id: I3afc01e2e5f55c254606379f353b030ea297ee36
2010-08-24 13:33:25 -07:00
Dianne Hackborn
e794e9f9b7 Verify that onPause() calls its superclass.
Change-Id: Ibf48992b4445bfc726ade307aad26f3e9577c5fb
2010-08-24 12:32:10 -07:00
Robert Greenwalt
6d73469335 Merge "Send all Connectivity broadcasts." into gingerbread 2010-08-24 12:01:50 -07:00
Brad Fitzpatrick
97461bd25c Some StrictMode API changes.
* rename setThreadBlockingPolicy to setThreadPolicy (opens the way to
  using StrictMode for non-blocking-related things in the future?)

* add allowThreadDiskWrites() and allowThreadDiskReads() to modify the
  current policy mask and return the old one.  this will allow turning
  off part of StrictMode during certain regions of code.  (for
  instance, writing to disk in Activity onPause...)

Change-Id: Ia1878153713f79299971fdab567fa15b3cb9d56c
2010-08-24 11:47:19 -07:00
Robert Greenwalt
9d6b59c08e Send all Connectivity broadcasts.
We were using a flag so new broadcasts replaced old.  If people are expecting
to see all the broadcasts they sometimes would fail.

bug:2892383
Change-Id: I63df17fe8f8c68f59e1ad6297fe93e169b4463b4
2010-08-24 11:47:10 -07:00
Gilles Debunne
2703a42d16 When an EditText gains focus by tapping, move the insertion point where tapped.
The previous behavior was to move cursor at the end of the first line,
which feels weird.

Change-Id: I5a72f9871ed79ee2c521698ea642ba126537f4f9
2010-08-24 10:18:31 -07:00
Eric Laurent
b6d71351c0 Merge "LVM release 1.05 delivery" into gingerbread 2010-08-24 09:50:13 -07:00
Hung-ying Tyan
cf95f5d263 SipProfile: add isOutgoingCallAllowed() and new builder constructor
Change-Id: I7ced47079fd2b00c7160b152eb4c1d34399e39dc
2010-08-24 21:32:10 +08:00
Hung-ying Tyan
3294d44b96 Add confcall management to SIP calls
and fix the bug of re-assigning connectTime's in SipConnection,
and adding synchronization for SipPhone to be thread-safe,
and set normal audio mode when call not on hold instead of on hold in SipAudioCallImpl,
and fix re-entrance problem in CallManager.setAudioMode() for in-call mode.

Change-Id: I54f39dab052062de1ce141e5358d892d30453a3a
2010-08-24 17:54:47 +08:00
Chia-chi Yeh
a83987d2cc Merge "RTP: integrate the echo canceller from speex." into gingerbread 2010-08-24 02:28:41 -07:00
Chia-chi Yeh
4ae6ec428f RTP: integrate the echo canceller from speex.
Currently the filter_length is set to one second.
Will change that when we have a better idea.

Change-Id: Ia942a8fff00b096de8ff0049a448816ea9a68068
2010-08-24 16:04:18 +08:00
Chia-chi Yeh
5b1f0c9f64 Merge "RTP: reduce the latency by overlapping AudioRecord and AudioTrack." into gingerbread 2010-08-23 23:28:45 -07:00