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

48739 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mike Lockwood
80e0a416a6 MountService: Fix running media scanner at boot. 
Change-Id: Ibd1111b7ec6380011cd10a56f11f891f2e16abc2
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-04-05 10:22:25 -04:00
Mike Lockwood
84338c4559 Fix deadlock in MountService 
It is not safe to call into vold with a lock held on mVolumeStates
since we will receive events back from vold on a different thread.
So in the boot completed handler we make a copy of the volume list and
then call vold to mount volumes after releasing the lock

Change-Id: I0dee91f09e4056132aaaf0fb0a663148c65db1e4
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-04-05 10:07:53 -04:00
Adam Powell
3c534772de Fix bug 4207704 - Gestures can be lost when Flash is enabled 
Pre-queue WebView touch events as we send them to webkit so that we
can run them through WebView later if webkit or hosted plugins go out
to lunch.

Change-Id: Id4e9f56beeb0c1d55e77233423844b15f6f00aef
 2011-04-04 22:06:50 -07:00
Mathias Agopian
fb96b5ece3 Remove unused references to ISurface 
Change-Id: I542806b5c91c525ed7cde821f6963f1e020ddf1a
 2011-04-04 21:09:55 -07:00
Eric Laurent
7a492a9ad4 am b7a76e84: am a482d83c: Merge "Issue 4157048: mic gain for VoIP/SIP calls." into gingerbread 
* commit 'b7a76e84fde7fe534d46aaaa71e3224798354009':
  Issue 4157048: mic gain for VoIP/SIP calls.
 2011-04-04 17:44:50 -07:00
Mike Lockwood
824c6edce8 am 179122ad: (-s ours) am a8731e1e: Merge "DO NOT MERGE: UsbService: Make USB disconnect handling for accessory mode more robust" into gingerbread 
* commit '179122ad56f12bd802fd29fe0b6606dd23ec5ba9':
  DO NOT MERGE: UsbService: Make USB disconnect handling for accessory mode more robust
 2011-04-04 17:44:46 -07:00
Trevor Johns
fa6b78890b am ea477d20: am cafbe87d: Merge "Fixing line in Market IAB docs that explains how to bind to the MarketService." into gingerbread 
* commit 'ea477d2043eeb8c20435f17b139bd5dd1248d763':
  Fixing line in Market IAB docs that explains how to bind to the MarketService.
 2011-04-04 17:44:42 -07:00
Simon Wilson
442bf4cd1e am d7a8e845: (-s ours) am ec944728: Merge "DO NOT MERGE Disable WiMAX when "Data Enabled" is off" into gingerbread 
* commit 'd7a8e8453d8302ac9820af49b4b112468efdf36d':
  DO NOT MERGE Disable WiMAX when "Data Enabled" is off
 2011-04-04 17:44:38 -07:00
Christopher Tate
42bc0e946f Merge "Fix deadlock in BackupManagerService" 2011-04-04 17:41:22 -07:00
Mike Lockwood
cace13d72a Merge "StorageManager: Add getVolumeList() and getVolumeState() methods" 2011-04-04 17:39:21 -07:00
Mike Lockwood
47c5581ada Merge "MountService: Add support for multiple volumes" 2011-04-04 17:39:15 -07:00
Bill Gruber
50c697e591 am 0ac3183c: am f0d2c1c4: am 63ac0379: am d36bc32e: Merge "SDK doc updates" into honeycomb 
* commit '0ac3183c6489120fa84df9e289b2db31fb49c842':
  SDK doc updates
 2011-04-04 17:37:46 -07:00
Bill Gruber
0ac3183c64 am f0d2c1c4: am 63ac0379: am d36bc32e: Merge "SDK doc updates" into honeycomb 
* commit 'f0d2c1c4eb613130e34a4f377d8f82f935170873':
  SDK doc updates
 2011-04-04 17:35:34 -07:00
Bill Gruber
f0d2c1c4eb am 63ac0379: am d36bc32e: Merge "SDK doc updates" into honeycomb 
* commit '63ac03794df9ca383416c3a782812b9a9c03456d':
  SDK doc updates
 2011-04-04 17:31:23 -07:00
Eric Fischer
50a8be6c8a Import revised translations. 
Change-Id: I818cbbb1741e083bc105596dba103f2ee0c0582a
 2011-04-04 17:29:34 -07:00
Bill Gruber
63ac03794d am d36bc32e: Merge "SDK doc updates" into honeycomb 
* commit 'd36bc32ea9a109596308a0516b3e0898c82cebc5':
  SDK doc updates
 2011-04-04 17:21:25 -07:00
Bill Gruber
d36bc32ea9 Merge "SDK doc updates" into honeycomb 2011-04-04 17:15:08 -07:00
Jason Sams
48f505657a Seperate GL from RS program store. 
Change-Id: I0eae9c0699845af8e8611b065e70738cc9f2b15c
 2011-04-04 17:09:37 -07:00
Christopher Tate
4559764e9f Fix deadlock in BackupManagerService 
Lock ordering bug.  The fix is to avoid having to hold both locks
simultaneously in one prong of the deadlock.  (Further strengthening:
the code path for potentially acquiring both simultaneously now
begins at a common method, ensuring that lock ordering is always
consistent.)

Change-Id: If9433aff8326fec2ba0e97e96ad2d835b01e2cda
 2011-04-04 16:59:21 -07:00
Bill Gruber
604917b339 SDK doc updates 
Change-Id: Iaf24235cf40a4e22a4c8ee787f0b18ce8f5cb61e
 2011-04-04 16:55:53 -07:00
Eric Fischer
9f4ef02aef am 2e715df8: (-s ours) am d20023ae: (-s ours) am 8b312c6c: Merge "Import revised translations. DO NOT MERGE" into gingerbread 
* commit '2e715df8d4a568d3a6d7e2ee569ab1331dcafaa7':
  Import revised translations.  DO NOT MERGE
 2011-04-04 16:46:38 -07:00
Jason parks
c5a229665d am 5ee250aa: am 1d733625: am cca2f2f9: Merge "Send out a broadcast that the system is being factory reset." into gingerbread 
* commit '5ee250aa744720c90b264966f9721cfb9d256e96':
  Send out a broadcast that the system is being factory reset.
 2011-04-04 16:46:34 -07:00
Justin Ho
77a1d4ae01 am d95fa2ff: am 0f5e36de: am 87805ca3: Updated CDMA roaming icons 
* commit 'd95fa2ff8cf7cc302dab5de0f1becf67bd298898':
  Updated CDMA roaming icons
 2011-04-04 16:46:31 -07:00
Jean-Baptiste Queru
70d81b3ab6 am e2fbd0a9: am 0c61e105: am bef31431: No-op - reconcile with open-source gingerbread 
* commit 'e2fbd0a9b03956dbb7d787ed435b895cfc735780':
 2011-04-04 16:46:29 -07:00
Robert Greenwalt
b6c5d824c0 am e716a551: resolved conflicts for merge of ab2194aa to honeycomb-plus-aosp 
* commit 'e716a5515bfb9d9f1f8a5b87fee8b75bef3a1a96':
  Only leave one default network up at a time.
 2011-04-04 16:44:25 -07:00
Eric Fischer
2e715df8d4 am d20023ae: (-s ours) am 8b312c6c: Merge "Import revised translations. DO NOT MERGE" into gingerbread 
* commit 'd20023ae44e611b104b58bc23aae6a42b219a503':
  Import revised translations.  DO NOT MERGE
 2011-04-04 16:43:48 -07:00
Jason parks
5ee250aa74 am 1d733625: am cca2f2f9: Merge "Send out a broadcast that the system is being factory reset." into gingerbread 
* commit '1d73362597c49f4692a580460bc8697a8f1d0efa':
  Send out a broadcast that the system is being factory reset.
 2011-04-04 16:43:34 -07:00
Justin Ho
d95fa2ff8c am 0f5e36de: am 87805ca3: Updated CDMA roaming icons 
* commit '0f5e36deee14b9d21dcf8ca2986e63b38fa9354b':
  Updated CDMA roaming icons
 2011-04-04 16:43:23 -07:00
Jean-Baptiste Queru
e2fbd0a9b0 am 0c61e105: am bef31431: No-op - reconcile with open-source gingerbread 
* commit '0c61e105906f96e5139beb8162c0ead8787faf7a':
 2011-04-04 16:43:15 -07:00
Chet Haase
b76bcc07d8 Merge "Fix bug with values in cloned animators." 2011-04-04 16:27:38 -07:00
Robert Greenwalt
e716a5515b resolved conflicts for merge of ab2194aa to honeycomb-plus-aosp 
Change-Id: I99a29f920336b00b26b9aadafd2bd835049f48cf
 2011-04-04 16:26:42 -07:00
Mike Lockwood
8fa5f804e2 StorageManager: Add getVolumeList() and getVolumeState() methods 
Change-Id: Icf3301827dd27e8430bd44eaafde517a31ef035a
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-04-04 18:54:03 -04:00
Mike Lockwood
7fa24aa8da MountService: Add support for multiple volumes 
Change-Id: I4eaa781cf302c7aaae170af2489b6b29120c0b81
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-04-04 18:53:58 -04:00
Chet Haase
d4dd7025a1 Fix bug with values in cloned animators. 
When a ValueAnimator is cloned, we correctly clone the underlying
PropertyValuesHolder objects and assign them to the new object.
However, we then put values into the new property map using the
old values instead of the new ones. This means that the per-property
animated values cannot be retrieved with the property names from
the cloned animator, because the map refers to the values of the
original object, not the cloned object that is actually being animated.
Fix is easy: just put the cloned values (which are already being created)
into the map.

Change-Id: I81282ca1dab6b1767ddc894d57a1110b344b4b0a
 2011-04-04 15:33:55 -07:00
Robert Greenwalt
1254e7a357 am da8beef5: am 37229514: Merge "resolved conflicts for merge of 7544b23e to gingerbread-plus-aosp" into gingerbread-plus-aosp 
* commit 'da8beef55612738d87d6aa520445377a9e4ae784':
  Fix Default route after secondary net use.
 2011-04-04 15:28:56 -07:00
Brad Fitzpatrick
9a9adb5d25 am 5851b866: am 27e00544: am 9907d161: Merge "Fix data corruption when writing to Bluetooth socket" 
* commit '5851b8662dc95372d68df293cb13c59da0cf8582':
  Fix data corruption when writing to Bluetooth socket
 2011-04-04 15:28:54 -07:00
Brad Fitzpatrick
bc20ac85a5 am e511fb33: am 9b1b6439: am 2ed72048: Merge "Always return a valid index from Rfc822Tokenizer.findTokenEnd()" 
* commit 'e511fb33d33f0ba83ce437f615fa236f369b5ade':
  Always return a valid index from Rfc822Tokenizer.findTokenEnd()
 2011-04-04 15:28:51 -07:00
Brad Fitzpatrick
37334c0f34 am 8f7aad14: am f7a34b15: am e558a000: Merge "Avoid crash in system server when mounting container" 
* commit '8f7aad147d790b25bae7301827e070df72690341':
  Avoid crash in system server when mounting container
 2011-04-04 15:28:48 -07:00
Robert Greenwalt
da8beef556 am 37229514: Merge "resolved conflicts for merge of 7544b23e to gingerbread-plus-aosp" into gingerbread-plus-aosp 
* commit '37229514c56dac0c1e3cef6bc8229232d0c75b96':
  Fix Default route after secondary net use.
 2011-04-04 15:25:45 -07:00
Brad Fitzpatrick
5851b8662d am 27e00544: am 9907d161: Merge "Fix data corruption when writing to Bluetooth socket" 
* commit '27e00544ea08d25e8e9b1b94264205f9d53030fb':
  Fix data corruption when writing to Bluetooth socket
 2011-04-04 15:25:39 -07:00
Brad Fitzpatrick
e511fb33d3 am 9b1b6439: am 2ed72048: Merge "Always return a valid index from Rfc822Tokenizer.findTokenEnd()" 
* commit '9b1b64399502af0a08beac3014f2294644753602':
  Always return a valid index from Rfc822Tokenizer.findTokenEnd()
 2011-04-04 15:25:33 -07:00
Brad Fitzpatrick
8f7aad147d am f7a34b15: am e558a000: Merge "Avoid crash in system server when mounting container" 
* commit 'f7a34b15986f8c00bc6fb941a40f9acbe2c21aff':
  Avoid crash in system server when mounting container
 2011-04-04 15:25:21 -07:00
Robert Greenwalt
38a1345b8d am 549177e4: Merge "resolved conflicts for merge of 92d72ca0 to honeycomb-plus-aosp" into honeycomb-plus-aosp 
* commit '549177e4f3f5e2a92e1431c157cebb985068a5ee':
  Fix bad merge.
 2011-04-04 15:12:13 -07:00
Robert Greenwalt
549177e4f3 Merge "resolved conflicts for merge of 92d72ca0 to honeycomb-plus-aosp" into honeycomb-plus-aosp 2011-04-04 15:07:41 -07:00
Robert Greenwalt
ffe8723ca2 resolved conflicts for merge of 92d72ca0 to honeycomb-plus-aosp 
Change-Id: Ide9ed301618b89a1cced4885062c13047980890c
 2011-04-04 15:00:13 -07:00
Alex Sakhartchouk
78a9f6a822 Merge "First draft of fbo in renderscript. Updating samples and benchmark" 2011-04-04 14:33:19 -07:00
Gilles Debunne
fb2e9d23e0 Merge "IME is no longer shown when an EditText gets focus." 2011-04-04 14:25:45 -07:00
Roman Nurik
f5d41653a7 am 84967294: am 91315577: am 5a41a8a0: Merge "Document support for .TS video containers." into honeycomb-mr1 
* commit '84967294f25d223ff2c5e62378b40f20fd853c4c':
  Document support for .TS video containers.
 2011-04-04 13:51:18 -07:00
Roman Nurik
84967294f2 am 91315577: am 5a41a8a0: Merge "Document support for .TS video containers." into honeycomb-mr1 
* commit '9131557721afc93626f0fcbbe6e485a0c863cc87':
  Document support for .TS video containers.
 2011-04-04 13:47:34 -07:00
Roman Nurik
9131557721 am 5a41a8a0: Merge "Document support for .TS video containers." into honeycomb-mr1 
* commit '5a41a8a0fda21d5332f1355832550fcfffbb9975':
  Document support for .TS video containers.
 2011-04-04 13:44:23 -07:00