drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
46,232 Commits 1 Branch 0 Tags
Commit Graph

46232 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Jamie Gennis
dbb520e0a0 Merge "Fix error recovery in Stagefright init." 2011-03-01 10:24:55 -08:00
Mike Corrigan
bd15112a29 Fix the display priority of the airplane mode icon. 
The airplane icon is used as a fallback when no
other radios are available *and* the AIRPLANE_MODE_ON system
setting is set to 1. (NetworkController now tracks changes to
the setting via ACTION_AIRPLANE_MODE_CHANGED broadcasts.)

This fixes wifi-only devices, for which the previous logic
did not correctly and consistently detect airplane mode.

Bug: 3489820
Change-Id: I226bb0e977f6a5fd3f2d829ba51ca54c5c910ef3
 2011-03-01 13:20:07 -05:00
Mike Lockwood
7a976a4370 Fix UsbDeviceSettingsManager locking. 
Change-Id: I93117ce791de95b0ab95017601f5d90ed5dd7a6a
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-03-01 09:40:07 -08:00
Kenny Root
c39bb4aaa7 Switch to returnCode for IPackageDeleteObserver 
Before the IPackageDeleteObserver only knew whether the deletion
succeeded or failed, but not the reason why.

Bug: 2520191
Change-Id: I1f0d7c04f06c539660b6e17e7e133defb0f61b5b
 2011-03-01 09:27:57 -08:00
Mike Lockwood
5d019f0e6d am c01e201f: (-s ours) am 61c1bb4f: Merge "UsbService: Remove stack-trace message during boot. DO NOT MERGE" into gingerbread 
* commit 'c01e201f12149ca96593af4e18133d3b2fce5546':
  UsbService: Remove stack-trace message during boot. DO NOT MERGE
 2011-03-01 09:12:49 -08:00
Mike Lockwood
3fa12d459d am fc88f94f: (-s ours) am 6da062a9: Merge "DO NOT MERGE: Clean up USB notifications:" into gingerbread 
* commit 'fc88f94fc32fc010b153af32dea8e1fd4bae1f19':
  DO NOT MERGE: Clean up USB notifications:
 2011-03-01 09:12:45 -08:00
Mike Lockwood
91dceb8143 am 54e96c69: (-s ours) am 3333f8af: Merge "DO NOT MERGE UsbManager: squashed commit of:" into gingerbread 
* commit '54e96c69d068593f1d5893be6067509b07abdadc':
  DO NOT MERGE UsbManager: squashed commit of:
 2011-03-01 09:12:31 -08:00
Mike Lockwood
8697f397e2 am f41768c5: (-s ours) am f7b99b32: Merge "Give system server permission to access USB. DO NOT MERGE" into gingerbread 
* commit 'f41768c5837a078239e92d8fa1d2155394e4b6ac':
  Give system server permission to access USB. DO NOT MERGE
 2011-03-01 09:12:27 -08:00
Xavier Ducrohet
2d5ed07940 am 7b972755: (-s ours) am edbd6139: Merge "Merge 1911a6f7 into gingerbread. do not merge." into gingerbread 
* commit '7b9727558b42aecacd0ea63cf3b3c89e9bfd9e9b':
  Merge 1911a6f7 into gingerbread. do not merge.
 2011-03-01 09:12:15 -08:00
Mike Lockwood
c4308f01c9 Move USB framework support from android.hardware to android.hardware.usb package 
Change-Id: I00fd4f0caaa4aebe48f71c576bb211b5f38bf88d
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-03-01 08:07:20 -08:00
Chet Haase
108500ab22 Merge "Cleanup of docs for ViewPropertyAnimator class" 2011-03-01 07:41:42 -08:00
Chet Haase
d666cf320d Cleanup of docs for ViewPropertyAnimator class 
Fixed the copyright date, spec'd auto-canceling behavior of various methods,
fixed various typos.

Change-Id: I0db74787275890557a3ad8d617b69daeef2413ee
 2011-03-01 07:38:16 -08:00
Eric Fischer
43cdf9b419 am ae7fb488: (-s ours) am 04a536af: Merge "Import revised translations. DO NOT MERGE" into honeycomb 
* commit 'ae7fb4887394615b58c4e97fc5b1ad2e04441903':
  Import revised translations.  DO NOT MERGE
 2011-02-28 22:23:03 -08:00