46397 Commits

Author SHA1 Message Date
John Reck
09407b4810 Send correct cookies for HTML5 video when incognito
Bug: 3489551

Change-Id: Ic35ec725e72e97830afff2fb0392b2300d8c45f6
2011-03-01 14:35:03 -08:00
Romain Guy
6910f429cd Merge "Avoid UTF-8 conversions and string copies whenever possible." 2011-03-01 14:28:13 -08:00
Eric Fischer
86b7a59726 Import revised translations. DO NOT MERGE
Change-Id: I6f5f40b8dbbe271ccbb5493b3a6d7d1f08d1bdb3
2011-03-01 14:17:03 -08:00
Mathias Agopian
9f81547fc5 Add support for up to 32 buffers per Surface
Bug: 3488016

Change-Id: Ie5536ad77d42a4d0e8270e0fd87ecb73471bcbbc
2011-03-01 14:09:06 -08:00
Mathias Agopian
525af5d5b0 reformat file, which contained tabs instead of spaces
Change-Id: If26ef8be8c80a7894d256572cb3b9e60742dce57
2011-03-01 14:04:28 -08:00
Gilles Debunne
91b52b1895 Merge "AbsListView notifies scroll events to the ViewTreeObserver." 2011-03-01 13:55:16 -08:00
Daniel Sandler
aa051d66af Make with the clicky. (Status bar buttons now play FX.)
Now sending accessibility events and playing click noises:
 - Home
 - Back
 - Notification icons (if you tap; tap-and-hold/scrub is
   silent)
 - the clock area

I also added touch slop to the main nav buttons (should have
been there all along).

Bug: 3422943
Change-Id: Ib5ee1d3a7c79e60e05377715092cde3f7678ddcf
2011-03-01 16:36:21 -05:00
Costin Manolache
c039bb5d1e am 66d46ac6: (-s ours) am db52ab69: Merge "DO NOT MERGE Backport (with modifications ) some changes from Honeycomb, that would allow authenticators to control caching and permissions." into gingerbread
* commit '66d46ac61478c967ed45bd1c27b0436654d54299':
  DO NOT MERGE Backport (with modifications ) some changes from Honeycomb, that would allow authenticators to control caching and permissions.
2011-03-01 13:28:03 -08:00
Kristian Monsen
e4dcf0948a Merge "Part of fix for bug 3489551 Browser doesn't send cookies for HTML5 video in incognito" 2011-03-01 13:12:24 -08:00
Derek Sollenberger
3545c72ce1 Merge "Don't update webkit at every stage of a zoom animation." 2011-03-01 12:58:31 -08:00
Derek Sollenberger
ac382cf581 Don't update webkit at every stage of a zoom animation.
This CL defers updating webkit until a zoom animation has completed.

bug: 3451126
Change-Id: I75a90f307a3493363811ba67ec4e55bfec9c0702
2011-03-01 15:50:27 -05:00
Amith Yamasani
8d394fa899 Check for NTP time as soon as WIFI is connected.
Listen for connectivity changes. If WIFI is connected, check if
we have recently checked for NTP time. If we haven't yet checked the
time or it has been long enough (a day), then connect to the NTP server
and get the latest time. Update the time if it is significantly out of sync.

This doesn't poll the NTP server every time there is connectivity, only
if it hasn't been checked since boot or has been a day.

This fixes the problem that during SetupWizard, we try to contact the NTP
server before there is connectivity and fail. Now, as soon as the user
chooses a WiFi network to connect to, it will update the time before
getting to the Date/Time step. Then as soon as the user corrects the TZ,
the date/time should be correct.

Bug: 3491920
Change-Id: I62664156616510b67ecd6a1c24dd838b98d5204f
2011-03-01 12:41:04 -08:00
Eric Laurent
9b44c662d5 Fix issue 3499926.
Make sure that NumberEffectsEnabled is decremented at the same time as
SamplesToExitCountBb reaches 0 in Effect_process(). Not doing so
causes NumberEffectsEnabled not being decremented if Effect_setEnabled()
is called after SamplesToExitCountBb reaches 0 and before next Effect_process() is called.

Change-Id: Id827a301f93a5a09ecd9995a0c7d731ef526711a
2011-03-01 12:35:18 -08:00
Fred Quintana
dfa28c3449 Merge "Fix a deadlock in AccountManagerService cause by different paths of code getting the mCacheLock and DB locks in different orders." 2011-03-01 12:30:06 -08:00
Costin Manolache
66d46ac614 am db52ab69: Merge "DO NOT MERGE Backport (with modifications ) some changes from Honeycomb, that would allow authenticators to control caching and permissions." into gingerbread
* commit 'db52ab69f22e24615eaa2e8f9845e157426d3dd6':
  DO NOT MERGE Backport (with modifications ) some changes from Honeycomb, that would allow authenticators to control caching and permissions.
2011-03-01 12:29:40 -08:00
Dianne Hackborn
3a28f22eb6 Fix Issue 14340: Sticky Service killed with onDestroy not called, not restarted.
Change-Id: I2804c49ad5669ca89744c6d92ead0c7d21ee31d5
http://code.google.com/p/android/issues/detail?id=14340
2011-03-01 12:25:54 -08:00
Kristian Monsen
469aebbbd9 Part of fix for bug 3489551 Browser doesn't send cookies for HTML5 video in incognito
Adding private mode parameter for some cookie operations.

Depends on this change in webkit:
https://android-git.corp.google.com/g/#change,99051

Change-Id: I304de625632c3d659bf0d7a6b6a6e2bec985ecb6
2011-03-01 20:25:36 +00:00
Costin Manolache
db52ab69f2 Merge "DO NOT MERGE Backport (with modifications ) some changes from Honeycomb, that would allow authenticators to control caching and permissions." into gingerbread 2011-03-01 12:25:21 -08:00
Santosh Madhava
2380aa08c2 Merge "Fix for issue 3431967: Memory leak from video editor engine" 2011-03-01 12:04:12 -08:00
Mike Lockwood
6ebc6bde63 Merge "UsbDeviceSettingsManager: don't write settings file when not necessary" 2011-03-01 12:00:09 -08:00
Mike Lockwood
b4948d4d3f Merge "Fix UsbDeviceSettingsManager locking." 2011-03-01 11:59:32 -08:00
Mike Lockwood
04e1a9620f Merge "Move USB framework support from android.hardware to android.hardware.usb package" 2011-03-01 11:58:22 -08:00
Eric Laurent
42b3de5833 Merge "Fix issue 3479042." 2011-03-01 11:46:15 -08:00
Romain Guy
321dce646d Avoid UTF-8 conversions and string copies whenever possible.
Change-Id: Ie4584417bbb7247e6c567fbfdb819529e548bb8f
2011-03-01 11:45:33 -08:00
Santosh Madhava
71771b3b1b Fix for issue 3431967: Memory leak from video editor engine
Change-Id: Ibaa66d7c95f2a60b59dc3102d3b5130ff1fbc62e
2011-03-01 11:44:50 -08:00
Eric Laurent
bbc9fd3aca Fix issue 3388775.
Do not select A2DP output for media strategy when it is suspended because
BT SCO is active. Media audio will be routed to speakers or SCO HS
(depending on phone state and activity on stream VOICE_CALL) which is less
confusing than not hearing anything while music progress bar is moving.

Change-Id: Iff8cc1ea9bf9bde0b33035c4d91398db0934b836
2011-03-01 11:42:43 -08:00
Jamie Gennis
7fc013753b Merge "Stagefright: Query buffer usage from the component." 2011-03-01 11:41:29 -08:00
Irfan Sheriff
2f6409686f Merge "Using AsyncChannel for wifi connectivity" 2011-03-01 11:32:24 -08:00
Fred Quintana
f9f240e3ad Fix a deadlock in AccountManagerService cause by different
paths of code getting the mCacheLock and DB locks in different
orders.

The philosophy I followed for this was to ensure that the
DatabaseHelper is only ever accessed from within a
synchronized(mCacheLock) block. I also renamed a bunch of
methods to make it easier to know if a given method should
be called from within this synchronized block.

Bug: 3404506
Change-Id: Ia48f95e77b77647d0717f70f1d8364da3719cc13
2011-03-01 11:23:19 -08:00
Costin Manolache
ef419b2e14 DO NOT MERGE
Backport (with modifications ) some changes from Honeycomb, that would allow authenticators to control caching and permissions.

This is backward compatible - both new and old authenticators will work with old and new framework,
but the functionality will only be present if both sides support it.

Change-Id: Ib2838cc2159f45264b38c844cd4c1d6f315d8064
2011-03-01 11:20:06 -08:00
Leon Scroggins
6e0e0ec980 Fix password field drawing.
Bug:3499916

Change-Id: Idb10e9780e6a0cfecd6228de0fbfd4a1035ab61e
2011-03-01 14:17:30 -05:00
Dianne Hackborn
4b8c9b7405 am 7fff2d19: am 1de4a2ca: am 62619392: Merge "Fix leak when keylock is recreated."
* commit '7fff2d19a24f9f9b669676864dc5652ab179d2fc':
  Fix leak when keylock is recreated.
2011-03-01 11:13:14 -08:00
Jaikumar Ganesh
998a5617d5 am 516393fa: am 9711b9b7: am 1eefb529: Merge "Phone crash when old callback func is woken up when enabling BT."
* commit '516393faba128ce43bee98b6319e060744fe7be6':
  Phone crash when old callback func is woken up when enabling BT.
2011-03-01 11:12:56 -08:00
Eric Fischer
9d30f5bce1 Merge "Import revised translations." 2011-03-01 11:11:24 -08:00
Mike Corrigan
49853dc19c am bd15112a: Fix the display priority of the airplane mode icon.
* commit 'bd15112a29eefb93e62235574b694746044c9261':
  Fix the display priority of the airplane mode icon.
2011-03-01 11:08:45 -08:00
Mike Lockwood
31ad11eb44 UsbDeviceSettingsManager: don't write settings file when not necessary
Change-Id: I48772f71822e3489f9e6c640985055569a656124
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-03-01 11:03:19 -08:00
Eric Fischer
5db857209f Import revised translations.
Change-Id: Ibd5a50501b157fccde300eb6822a7627c91e6640
2011-03-01 10:59:51 -08:00
Mike Lockwood
8924a7a3db am 5d019f0e: (-s ours) am c01e201f: (-s ours) am 61c1bb4f: Merge "UsbService: Remove stack-trace message during boot. DO NOT MERGE" into gingerbread
* commit '5d019f0e6d57cdd633aa976a8a0f221941afd343':
  UsbService: Remove stack-trace message during boot. DO NOT MERGE
2011-03-01 10:59:00 -08:00
Mike Lockwood
ca8ab8a0cb am 3fa12d45: (-s ours) am fc88f94f: (-s ours) am 6da062a9: Merge "DO NOT MERGE: Clean up USB notifications:" into gingerbread
* commit '3fa12d459d16fb1d3d06b6c68b201340c9d3afcd':
  DO NOT MERGE: Clean up USB notifications:
2011-03-01 10:58:56 -08:00
Mike Lockwood
4ff963328d am 91dceb81: (-s ours) am 54e96c69: (-s ours) am 3333f8af: Merge "DO NOT MERGE UsbManager: squashed commit of:" into gingerbread
* commit '91dceb8143c9dab6b9b0ad38b5a3d7bb0586c677':
  DO NOT MERGE UsbManager: squashed commit of:
2011-03-01 10:58:52 -08:00
Mike Lockwood
3d37ca42fe am 8697f397: (-s ours) am f41768c5: (-s ours) am f7b99b32: Merge "Give system server permission to access USB. DO NOT MERGE" into gingerbread
* commit '8697f397e29cdfb90f84fab584eff9edc2b0dc6f':
  Give system server permission to access USB. DO NOT MERGE
2011-03-01 10:58:49 -08:00
Xavier Ducrohet
52c98b41d6 am 2d5ed079: (-s ours) am 7b972755: (-s ours) am edbd6139: Merge "Merge 1911a6f7 into gingerbread. do not merge." into gingerbread
* commit '2d5ed07940bc1966d4b55999634f05515e7fe197':
  Merge 1911a6f7 into gingerbread. do not merge.
2011-03-01 10:58:45 -08:00
Gilles Debunne
0a1b818b8c AbsListView notifies scroll events to the ViewTreeObserver.
ViewTreeObserver OnScrollChangedListener will then get notified.

The scroll values are not specified, since they are passed to the
base View.onScrollChanged method that simply sets the flags.

No need to throw these from a Runnable (in case this happens during
a relayout) since the listeners will be notified later from ViewRoot.draw().

Calling View.onScrollChanged in invokeOnItemScrollListener for normal scroll and
in onOverScrolled to handle mScroller animation.

Change-Id: Ib41434e5cd82e5a45ca6653db576746e89ef072d
2011-03-01 10:58:22 -08:00
Wink Saville
8366b23317 am 23fe0059: (-s ours) am 0eb6af89: Merge "Fixing the write of BackgroundData setting, DO NOT MERGE." into honeycomb
* commit '23fe005900aab2955052e0c9dc36ca05ea351a1a':
  Fixing the write of BackgroundData setting, DO NOT MERGE.
2011-03-01 10:58:05 -08:00
Gilles Debunne
5bf7658cb8 Merge "Removed ViewTreeObserver null checks" 2011-03-01 10:50:00 -08:00
Gilles Debunne
0357e5b2fe Merge "Scrollable tabs are correctly displayed." 2011-03-01 10:49:23 -08:00
Adam Powell
857447f1f9 Merge "Fix a bug where the lazy-initialized ActionBar object was being too lazy." 2011-03-01 10:46:42 -08:00
Adam Powell
763cbb134f Fix a bug where the lazy-initialized ActionBar object was being too lazy.
Change-Id: I80dc06deffd1df8cc8ae96fd878d66a101a17086
2011-03-01 10:45:34 -08:00
Eric Rowe
99cf1e0ca3 Merge "Add test cases for AudioManager SCO methods." 2011-03-01 10:31:26 -08:00
Jamie Gennis
29f87f76bc Merge "Add an OMX IL API for querying buffer usage flags." 2011-03-01 10:25:38 -08:00