19915 Commits

Author SHA1 Message Date
Brian Carlstrom
4ab72cb7e7 b/2511635 Browser displays incorrect SSL cert information
WebView's mCertificate member was not cleared when going to new
pages. Rather than clearing mCertificate as was done in previously in
WebView.goBackOrForward, we now clear when CallbackProxy receives a
PAGE_STARTED message.

This problem was highlighted whenever we went to a https page that was
in the cache, since the cache does not store certificate information,
so "More > Page Info > View Certifcate" was showing the certificate of
the last non-cached page because it had not been cleared. See also
b/2516638 "SslCertificate information not cached by CacheManager"

Change-Id: I40284f22ceb7150a6b20ecc2741f6153ed9a3276
2010-03-16 15:14:22 -07:00
Daisuke Miyakawa
beb0c1b3ec Merge "Make JNI function for setLocale() call register_localized_collators() with the current locale, not previous one, every time it is possible." 2010-03-16 15:04:13 -07:00
Marco Nelissen
ea579c7d73 Merge ""isPlaying" should never block, acquiring the mutex here is unnecessary, rather than investing in a separate mutex guarding just "mFlags" we accept returning "true" from isPlaying one too many times." 2010-03-16 14:46:22 -07:00
Joe Onorato
4040d44dc4 Merge "fix typos in docs" 2010-03-16 14:45:36 -07:00
Joe Onorato
e0d3507764 fix typos in docs
Change-Id: I201ac8d310aab4b3cbd8e0eb2af805f1e6d929ea
http://code.google.com/p/android/issues/detail?id=7086
2010-03-16 14:44:09 -07:00
Andreas Huber
10ce6c5bbd Merge "Properly use a long long literal to avoid under/overflow during fps computation." 2010-03-16 14:43:57 -07:00
Andreas Huber
d73a81c28b Properly use a long long literal to avoid under/overflow during fps computation.
Change-Id: I04730c86d43d6192ded3e779631effda9dd06e63
2010-03-16 14:34:17 -07:00
Andreas Huber
1fbf63abf4 "isPlaying" should never block, acquiring the mutex here is unnecessary, rather than investing in a separate mutex guarding just "mFlags" we accept returning "true" from isPlaying one too many times.
Change-Id: I597577cbb3ad1afd3cb3ca91979ef24cc1a44658
related-to-bug: 2518319
2010-03-16 14:31:52 -07:00
Grace Kloba
1e65d9e561 Use float instead of cast to int when calculating
the new zoom center. This should avoid the rounding
difference which caused the video in nytimes.com
not fully fit in the current view.

Fix http://b/issue?id=2512510
2010-03-16 14:21:21 -07:00
Derek Sollenberger
43bde92913 Merge "Plugin surfaces will be limited to 270% of the devices screen size." 2010-03-16 13:53:34 -07:00
Derek Sollenberger
d222a16286 Plugin surfaces will be limited to 270% of the devices screen size.
Change-Id: I7e5ff1f5b8919b9e2e70a703009f9544f457a0e1
2010-03-16 16:52:20 -04:00
Romain Guy
9f4c8e9a3a Merge "Resize AutoCompleteTextView's dropdown when the list content changes. Bug #2517711" 2010-03-16 13:50:32 -07:00
Romain Guy
6a67810228 Resize AutoCompleteTextView's dropdown when the list content changes.
Bug #2517711

Change-Id: Ibd4a9458d517063483712a60fb6d6b63311bbd0c
2010-03-16 13:49:31 -07:00
Vasu Nori
a5bd122122 Merge "close() database should close the db no matter what the ref count says" 2010-03-16 13:33:29 -07:00
Daniel Sandler
0794cd33dd Merge "Move MountService's Handler to a different thread." 2010-03-16 13:16:15 -07:00
Jack Palevich
4f33d80056 Merge "Implement eglInitialize / eglTerminate reference counting" 2010-03-16 13:00:30 -07:00
Andreas Huber
7f83e10c23 Merge "Properly handle errors during the codec configuration phase, attempt to revert to next available (likely software-) codec if configuration fails." 2010-03-16 12:59:42 -07:00
Daniel Sandler
5f27ef4968 Move MountService's Handler to a different thread.
This should help avoid blocking the system UI during storage
operations.

Change-Id: Ic53cb370baf47e8b00476706ac8df45645a2d814
2010-03-16 15:44:38 -04:00
Brett Chabot
52c6c108d3 Merge "Remove flaky test MemoryFileTest:testPurge from large suite." 2010-03-16 12:44:03 -07:00
Vasu Nori
04708b57da Merge "fix the way last insert rowid is returned" 2010-03-16 12:29:19 -07:00
Derek Sollenberger
7148b15fef Merge "Restrict plugins to a fixed size surface after exceeding a pixel threshold." 2010-03-16 12:01:08 -07:00
Bjorn Bringert
46704571c6 Merge "Set SOURCE to app package name when starting QSB (if not set)" 2010-03-16 12:00:25 -07:00
Brett Chabot
e1e37c632c Remove flaky test MemoryFileTest:testPurge from large suite.
Bug 2203775

Change-Id: I4709c0910384f1f2313dc67bfe6e163beaa990e6
2010-03-16 11:50:20 -07:00
Andreas Huber
2a09c7e042 Properly handle errors during the codec configuration phase, attempt to revert to next available (likely software-) codec if configuration fails.
Change-Id: Id1c699711e30139c9cc29df972254b5ba026e6fb
related-to-bug: 2517098
2010-03-16 11:44:07 -07:00
Romain Guy
8ae4c67a8b Merge "Dismiss a dialog if dimissed right after calling show(). Bug #2508607" 2010-03-16 11:41:34 -07:00
Romain Guy
08a4ac3999 Dismiss a dialog if dimissed right after calling show().
Bug #2508607

Change-Id: Id1b3afcaabf700386f70a46bc2401154575149aa
2010-03-16 11:40:40 -07:00
Vasu Nori
f6373e9513 close() database should close the db no matter what the ref count says
bug:2455416
Change-Id: Ia995c952c6941fbaa016c5b251e4980fa5328fbb
2010-03-16 10:53:40 -07:00
Derek Sollenberger
41df3f7e15 Restrict plugins to a fixed size surface after exceeding a pixel threshold.
fixes bug: http://b/issue?id=2428737

Change-Id: I8d8f2c591ac8539a345e0167b05bec8539f34535
2010-03-16 13:47:04 -04:00
Jaikumar Ganesh
e118d6fbde Merge "Add ABORT support to Obex lib" 2010-03-16 10:05:32 -07:00
Fred Quintana
202755c5e4 Merge "- make the SyncManager add periodic syncs when it upgrades from a version of the accounts.xml file that pre-dated periodic syncs, e.g. eclair or early froyo. http://b/2515823 - make the AccountManagerService dump() use a getAccounts call that doesn't check the GET_ACCOUNTS permission to make it useful in "adb bugreport" - add some logging to SyncManager to help track down a problem" 2010-03-16 10:02:51 -07:00
Fred Quintana
c2e4691d78 - make the SyncManager add periodic syncs when it upgrades from a
version of the accounts.xml file that pre-dated periodic syncs,
  e.g. eclair or early froyo. http://b/2515823
- make the AccountManagerService dump() use a getAccounts call that
  doesn't check the GET_ACCOUNTS permission to make it useful
  in "adb bugreport"
- add some logging to SyncManager to help track down a problem

Change-Id: Icb646909074e2d327d71f6bb39cf06b6fac29e77
2010-03-16 10:01:54 -07:00
Lixin Yue
8258ebdf12 Add ABORT support to Obex lib 2010-03-16 09:59:06 -07:00
Vasu Nori
5bf67247d2 fix the way last insert rowid is returned
if insert statement doesn't succeed, last inserted rowid
shoudl return -1 - instead of returning rowid of the last
successful insert that may have occurred years before this most
recent insert statement failure.

Change-Id: Ia517292afd58fdb600da900e0ee01fe051d6e618
2010-03-16 09:55:13 -07:00
Glenn Kasten
0543a5abd4 Merge "Fixes bug 2502132, and masks bug 2518313." 2010-03-16 09:39:50 -07:00
Kenny Root
0d4726a28e Merge "Fix regression in directory scanning" 2010-03-16 09:20:00 -07:00
Glenn Kasten
f62dd66a8a Fixes bug 2502132, and masks bug 2518313.
Change-Id: I5c5ecf1c10763f7b3f3d1e5c57dc5ce77cc344fd
2010-03-16 09:17:57 -07:00
Andreas Huber
d489240362 Merge "HTTPDataSource must be connected before it is usable. Fix this in the stagefright tool." 2010-03-16 09:11:44 -07:00
Andreas Huber
1af34becb1 HTTPDataSource must be connected before it is usable. Fix this in the stagefright tool.
Change-Id: I5313b2cb7839233d51b2d37a03b6598b0760c2e0
2010-03-16 09:05:38 -07:00
Kenny Root
c7f394eeb5 Merge "Adjust expected text frame length in ID3" 2010-03-16 09:03:56 -07:00
Leon Clarke
c0b778e10f http://b/issue?id=2501101
Create a concept of blocking messages on destruction similar to that in
WebViewCore.java. This is to prevent what I think is a race condition
caused by an orientation event occuring just before the frame is destroyed,
resulting in the orientation listener being called back just before it
is disabled, but posting its message after the messages have been removed.
This results in the orientation event being delivered to a NULL native frame.
2010-03-16 15:28:39 +00:00
Bjorn Bringert
3c24cb77e7 Set SOURCE to app package name when starting QSB (if not set)
If QSB is started by SearchManager.startSearch(globalSearch=true)
from some app that doesn't set SOURCE, it will be set to the
package name of that app.

Bug: http://b/issue?id=2315234
Change-Id: Ic07a143b27b658dea8b081b973ac24349a18b9f1
2010-03-16 12:56:24 +00:00
Kenny Root
0c2ab24b94 Adjust expected text frame length in ID3
When encountering a null character in an ID3 text frame, adjust the
expected size accordingly so it isn't misidentified as ASCII.

This fixes http://b/2517444

Change-Id: I19a3284d378e882c33b28ecee528a434716c7707
2010-03-15 22:47:18 -07:00
Mathias Agopian
2c62f5f433 Merge "fix [2515291] Native crash and runtime restart while trying to preview captured picture on Sapphire" 2010-03-15 21:36:10 -07:00
Jack Palevich
0a41c3c706 Implement eglInitialize / eglTerminate reference counting
Previously we imlpemented the standard semantics for
eglInitialize / eglTerminate, which are that
eglInitialize may be called any number of times,
but the first call to eglTerminate will terminate
the display.

Now we follow reference-countins semantics, which
means that eglTerminate will only terminate the
display when the reference count returns to zero.

This change allows EGL to be used by multiple
independently written modules in the same process.

(Otherwise there is no way for the independent
modules to coordinate their use of the display.)
2010-03-15 21:21:51 -07:00
Kenny Root
a8c02d77e4 Fix regression in directory scanning
Previous range-checking fix removed an inequality check. This change
restores it.

Offending change was I5eb310ced58c3c64a7af2d11b80326efe5adbcab

Change-Id: Ic952c3ba5a4f7e5ab2148ec623b6f083cb7495fb
2010-03-15 21:17:40 -07:00
Adam Powell
650e22ca3a Merge "Fix monkey bug 2512055" 2010-03-15 18:27:38 -07:00
Adam Powell
22cb2f46fd Fix monkey bug 2512055
Don't blow up when there aren't any menu items to layout in IconMenuView.

Change-Id: Ief08f0f8ed89aec4959d4d80cfd066dbe92dc3aa
2010-03-15 18:23:25 -07:00
Mathias Agopian
9e3d693b18 fix [2515291] Native crash and runtime restart while trying to preview captured picture on Sapphire
if a buffer couldn't be allocated because of an OOM, SF could, in some case dereference
a null pointer.

Change-Id: I5321248c38a21e56d5278b6aada2694e64451378
2010-03-15 18:15:20 -07:00
Romain Guy
82ce6f1c8e Merge "Round up ImageView translations to avoid nasty surprises. Bug #2499812" 2010-03-15 17:55:07 -07:00
Daisuke Miyakawa
b945639d0c Make JNI function for setLocale() call register_localized_collators()
with the current locale, not previous one, every time it is possible.

Add a unit test verifying this fix.

BUG: 2514026
Change-Id: I4dd1b047e1ab4bf399e2c3ebc0304c0cfa3a0928
2010-03-16 09:54:10 +09:00