26051 Commits

Author SHA1 Message Date
Mathias Agopian
c51114fe04 fix [2946787] Screen flicker on low resolution setting in camcorder.
Change-Id: I7e86f2b6d85dcae8dd212890b978fa6ac7de6893
2010-08-25 15:09:52 -07:00
Dianne Hackborn
43d9ac81f7 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
2010-08-25 15:09:17 -07:00
Eric Laurent
c14f9ca6e5 Merge "Added preset reverb." into gingerbread 2010-08-25 15:09:10 -07:00
Andreas Huber
cec075cc42 am 23584022: Merge "Ensure that buffering updates eventually hit 100% after we download everything." into gingerbread
Merge commit '235840228b0692b66d854ff499b5c4060f883e03' into gingerbread-plus-aosp

* commit '235840228b0692b66d854ff499b5c4060f883e03':
  Ensure that buffering updates eventually hit 100% after we download everything.
2010-08-25 15:01:45 -07:00
Andreas Huber
8735f8984a Fix support for per-frame unsynchronization in ID3V2.4 tags.
Change-Id: I6874b596f88817347756a375d9fb1c9bff418eca
related-to-bug: 2949149
2010-08-25 14:55:53 -07:00
Andreas Huber
235840228b Merge "Ensure that buffering updates eventually hit 100% after we download everything." into gingerbread 2010-08-25 14:54:36 -07:00
Mathias Agopian
43c87e44fc Improve Sensors documentation a bit
Change-Id: I6f4f9ebfaf1e7f461a795f717b9913e3a021e9d4
2010-08-25 14:35:54 -07:00
Cary Clark
1ef41605bb am d64f4a98: DO NOT MERGE fix null check
Merge commit 'd64f4a983df4fd11795e04896d8c48852f6b1777' into gingerbread-plus-aosp

* commit 'd64f4a983df4fd11795e04896d8c48852f6b1777':
  DO NOT MERGE fix null check
2010-08-25 13:53:05 -07:00
Konstantin Lopyrev
43b9b48f79 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
2010-08-25 13:38:27 -07:00
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
96dc45597e am b8814dce: 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
Merge commit 'b8814dce287552c1bdf13fa999296ebc7387776d' into gingerbread-plus-aosp

* commit 'b8814dce287552c1bdf13fa999296ebc7387776d':
  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.
2010-08-25 13:13:57 -07:00
Brad Fitzpatrick
edf32d0131 Start of SharedPreferences$Editor.startCommit()
No implementation yet, just the interface.

Change-Id: Idf9934b445da1fb72b79f0192218b47c0a7f5a34
2010-08-25 13:13:36 -07: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
Andreas Huber
c23296ef2d Ensure that buffering updates eventually hit 100% after we download everything.
Change-Id: I43bb85b1128fa9c1bc8632970d7101006393bcc8
related-to-bug: 2844095
2010-08-25 12:31:48 -07:00
Mathias Agopian
468204124e am 8eb16af2: Merge "don\'t try to lock a buffer that wasn\'t allocated with SW usage bits" into gingerbread
Merge commit '8eb16af29303cda190133a1d220b9ecd9341e261' into gingerbread-plus-aosp

* commit '8eb16af29303cda190133a1d220b9ecd9341e261':
  don't try to lock a buffer that wasn't allocated with SW usage bits
2010-08-25 12:17:19 -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
90b3135d8b am 4d672988: Merge "Remove "StringTest.java"." into gingerbread
Merge commit '4d672988fed7fbdd887fe78603fa2eaf713031ad' into gingerbread-plus-aosp

* commit '4d672988fed7fbdd887fe78603fa2eaf713031ad':
  Remove "StringTest.java".
2010-08-25 11:04:26 -07:00
Brian Carlstrom
4d672988fe Merge "Remove "StringTest.java"." into gingerbread 2010-08-25 11:02:22 -07:00
Brian Carlstrom
50d35946bd am 24bf70ca: Merge "Update AndroidRuntime with dalvik-dev changes" into gingerbread
Merge commit '24bf70cac0340c7556b4f98b690f3f9a3f80fc4a' into gingerbread-plus-aosp

* commit '24bf70cac0340c7556b4f98b690f3f9a3f80fc4a':
  Update AndroidRuntime with dalvik-dev changes
2010-08-25 10:55:47 -07:00
Brian Carlstrom
24bf70cac0 Merge "Update AndroidRuntime with dalvik-dev changes" into gingerbread 2010-08-25 10:53:10 -07:00
Eric Laurent
74ede9e4fd am 67b50606: Merge "Fix the simulator build." into gingerbread
Merge commit '67b506065e9fe3c56e3d1b47eedfa01170d574f9' into gingerbread-plus-aosp

* commit '67b506065e9fe3c56e3d1b47eedfa01170d574f9':
  Fix the simulator build.
2010-08-25 10:39:21 -07:00
Eric Laurent
67b506065e Merge "Fix the simulator build." into gingerbread 2010-08-25 10:37:27 -07:00
Jean-Baptiste Queru
44b31fdd86 am 7e2f87fa: am d5e601c2: reconcile open-source froyo into google variant
Merge commit '7e2f87fafa7d9ffd23cd17a95bf8a420cbebe758' into gingerbread-plus-aosp

* commit '7e2f87fafa7d9ffd23cd17a95bf8a420cbebe758':
  Make the default backup configuration "disabled; local transport selected"
2010-08-25 10:18:14 -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
Brian Carlstrom
7517ffd134 am 59073b15: Merge "Fix linux 64 build" into gingerbread
Merge commit '59073b155ab0d8a5706c90200e6af614510aba0e' into gingerbread-plus-aosp

* commit '59073b155ab0d8a5706c90200e6af614510aba0e':
  Fix linux 64 build
2010-08-25 10:07:18 -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
Kenny Root
fb2a9467ad 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
2010-08-25 07:38:33 -07:00
Hung-ying Tyan
0e05bd27be CallManager: remove unused Phone argument from stopDtmf() and sendBurstDtmf()
Change-Id: Ib0c83c373580f7be9cb1ee262cd0098c70db9c64
2010-08-25 18:18:15 +08:00
Chih-Chung Chang
20afae5150 am 231a0005: Merge "Avoid allocating buffer every time getThumbnail is called." into gingerbread
Merge commit '231a0005654d23284ab58a2d9ea892b995988c34' into gingerbread-plus-aosp

* commit '231a0005654d23284ab58a2d9ea892b995988c34':
  Avoid allocating buffer every time getThumbnail is called.
2010-08-25 00:09:22 -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
73497e9200 am 37f709ae: Merge "SipProfile: add isOutgoingCallAllowed() and new builder constructor" into gingerbread
Merge commit '37f709aeb0424948a8f69577c6fad39dc95d7733' into gingerbread-plus-aosp

* commit '37f709aeb0424948a8f69577c6fad39dc95d7733':
  SipProfile: add isOutgoingCallAllowed() and new builder constructor
2010-08-24 23:59:28 -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
2251894743 am bfc9325f: Merge "Add support for generated documentation as part of the SDK docs." into gingerbread
Merge commit 'bfc9325f8981173db51bc46af0e762dad1341671' into gingerbread-plus-aosp

* commit 'bfc9325f8981173db51bc46af0e762dad1341671':
  Add support for generated documentation as part of the SDK docs.
2010-08-24 23:03:32 -07: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
1922ac108c am d0ad67ad: Merge "Fix the test breakage in vCard tests." into gingerbread
Merge commit 'd0ad67ad84e254cdf34963ad4152ca7158df5eab' into gingerbread-plus-aosp

* commit 'd0ad67ad84e254cdf34963ad4152ca7158df5eab':
  Fix the test breakage in vCard tests.
2010-08-24 18:31:22 -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
384759b1c5 am 2b81d6dd: am 02e18d4d: Merge "Make the default backup configuration "disabled; local transport selected"" into froyo
Merge commit '2b81d6dd8aa470aff6026c019ca10dbc6d66f7c1' into gingerbread-plus-aosp

* commit '2b81d6dd8aa470aff6026c019ca10dbc6d66f7c1':
  Make the default backup configuration "disabled; local transport selected"
2010-08-24 18:23:56 -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
d335f9a903 am bb0eb5ca: Merge "Negatively cache settings and proactively slurp settings into cache." into gingerbread
Merge commit 'bb0eb5ca84262c90417fbb1b1c8ea3da19ac6e3a' into gingerbread-plus-aosp

* commit 'bb0eb5ca84262c90417fbb1b1c8ea3da19ac6e3a':
  Negatively cache settings and proactively slurp settings into cache.
2010-08-24 18:14:10 -07:00