OSDN Git Service
Mike Lockwood [Thu, 28 Jul 2011 20:23:01 +0000 (13:23 -0700)]
am
0ff79e88: Merge "GPS: Changes to enable on-demand data call flow for CDMA connections"
* commit '
0ff79e88e2d90f80d0346e0485abe773ca85c44d':
GPS: Changes to enable on-demand data call flow for CDMA connections
Mike Lockwood [Thu, 28 Jul 2011 20:13:35 +0000 (13:13 -0700)]
Merge "GPS: Changes to enable on-demand data call flow for CDMA connections"
Xavier Ducrohet [Thu, 28 Jul 2011 01:36:17 +0000 (18:36 -0700)]
am
20339b24: Merge "Remove Debug Code"
* commit '
20339b24394be06c5bfe5157a4b35adc48f665eb':
Remove Debug Code
Xavier Ducrohet [Thu, 28 Jul 2011 01:26:01 +0000 (18:26 -0700)]
Merge "Remove Debug Code"
Xavier Ducrohet [Wed, 27 Jul 2011 20:59:57 +0000 (13:59 -0700)]
am
4d1fa60b: (-s ours) Merge "DO NOT MERGE. may fix build on some version of gcc"
* commit '
4d1fa60bfe660fd0fc6671116da597c0027cbb16':
DO NOT MERGE. may fix build on some version of gcc
Xavier Ducrohet [Wed, 27 Jul 2011 20:45:05 +0000 (13:45 -0700)]
Merge "DO NOT MERGE. may fix build on some version of gcc"
Mathias Agopian [Tue, 14 Jun 2011 18:50:22 +0000 (11:50 -0700)]
DO NOT MERGE. may fix build on some version of gcc
Change-Id: Id99d390862731fd3fbc009dbffdf1d2a59dbe348
Dianne Hackborn [Fri, 22 Jul 2011 05:35:32 +0000 (22:35 -0700)]
am
6800a801: Merge "frameworks/base: Cap the number of toasts that a package can post."
* commit '
6800a80199477c90fc64af7211a177de06478a02':
frameworks/base: Cap the number of toasts that a package can post.
Dianne Hackborn [Fri, 22 Jul 2011 05:23:46 +0000 (22:23 -0700)]
am
2f4698fd: Merge "frameworks/base: unlink death notifications of Vibrate requests"
* commit '
2f4698fda46a3d2a6e78019588d77bae1cfa7193':
frameworks/base: unlink death notifications of Vibrate requests
Dianne Hackborn [Fri, 22 Jul 2011 05:21:19 +0000 (22:21 -0700)]
Merge "frameworks/base: Cap the number of toasts that a package can post."
Dianne Hackborn [Fri, 22 Jul 2011 05:18:47 +0000 (22:18 -0700)]
Merge "frameworks/base: unlink death notifications of Vibrate requests"
Xavier Ducrohet [Thu, 21 Jul 2011 23:23:18 +0000 (16:23 -0700)]
am
9bcf26ea: Merge "Layoutlib_create flag -p: don\'t change all accesses to public."
* commit '
9bcf26ea7aa108ce4bf4e973b4774d3e60eebafe':
Layoutlib_create flag -p: don't change all accesses to public.
Xavier Ducrohet [Thu, 21 Jul 2011 23:17:03 +0000 (16:17 -0700)]
Merge "Layoutlib_create flag -p: don't change all accesses to public."
Kenny Root [Thu, 21 Jul 2011 20:09:05 +0000 (13:09 -0700)]
am
3cf03987: Merge "Continue idmap generation even if name lookup fails."
* commit '
3cf039876177b5b314b635bb12a1dae1b42f4605':
Continue idmap generation even if name lookup fails.
Kenny Root [Thu, 21 Jul 2011 20:05:03 +0000 (13:05 -0700)]
Merge "Continue idmap generation even if name lookup fails."
Robert Greenwalt [Thu, 21 Jul 2011 18:28:01 +0000 (11:28 -0700)]
am
b9f87f19: Merge "First pass tying into per-interface DNS cache"
* commit '
b9f87f1970217d24213c8e3dd7755a0e4d82f8eb':
First pass tying into per-interface DNS cache
Robert Greenwalt [Thu, 21 Jul 2011 18:16:12 +0000 (11:16 -0700)]
Merge "First pass tying into per-interface DNS cache"
Xavier Ducrohet [Thu, 21 Jul 2011 01:49:46 +0000 (18:49 -0700)]
am
9bac0a9f: Merge "Fix to compile for windows"
* commit '
9bac0a9f93976ff341fc9c46b3a85be767119a88':
Fix to compile for windows
Xavier Ducrohet [Thu, 21 Jul 2011 01:35:35 +0000 (18:35 -0700)]
Merge "Fix to compile for windows"
Xavier Ducrohet [Wed, 20 Jul 2011 23:00:44 +0000 (16:00 -0700)]
am
0bc12a0b: Merge "Added Caching for PreProcessed PNGs"
* commit '
0bc12a0b13719976aff95a801d88e48c64510d11':
Added Caching for PreProcessed PNGs
Xavier Ducrohet [Wed, 20 Jul 2011 22:55:32 +0000 (15:55 -0700)]
Merge "Added Caching for PreProcessed PNGs"
Xavier Ducrohet [Wed, 20 Jul 2011 22:23:55 +0000 (15:23 -0700)]
am
1e24ccbd: Merge "Add generation of dependency file for .ap_ package"
* commit '
1e24ccbdd56a45c8bb5f2eba94af5aecd2d02554':
Add generation of dependency file for .ap_ package
Xavier Ducrohet [Wed, 20 Jul 2011 22:08:23 +0000 (15:08 -0700)]
Merge "Add generation of dependency file for .ap_ package"
Xavier Ducrohet [Tue, 19 Jul 2011 17:10:17 +0000 (10:10 -0700)]
am
d40c93f6: Merge "Add dependency generation to Aapt for R.java"
* commit '
d40c93f61ca5b3f2351b8db716f67b58f1625e85':
Add dependency generation to Aapt for R.java
Xavier Ducrohet [Tue, 19 Jul 2011 17:10:15 +0000 (10:10 -0700)]
am
42755155: Merge "Copy once-created R.java into library projects"
* commit '
42755155d6e8ddc3201b08def2bf262a64fa25f2':
Copy once-created R.java into library projects
Xavier Ducrohet [Tue, 19 Jul 2011 17:03:16 +0000 (10:03 -0700)]
Merge "Add dependency generation to Aapt for R.java"
Xavier Ducrohet [Tue, 19 Jul 2011 17:03:05 +0000 (10:03 -0700)]
Merge "Copy once-created R.java into library projects"
Conley Owens [Mon, 18 Jul 2011 23:52:26 +0000 (16:52 -0700)]
am
4d8f6a38: Merge "stagefright aacenc: Mark codeWord as UWord16"
* commit '
4d8f6a38e7268e29e189cb4173f42c7aa5b320a3':
stagefright aacenc: Mark codeWord as UWord16
Conley Owens [Mon, 18 Jul 2011 23:49:43 +0000 (16:49 -0700)]
Merge "stagefright aacenc: Mark codeWord as UWord16"
Deckard Autoverifier [Mon, 18 Jul 2011 22:38:30 +0000 (15:38 -0700)]
am
88409911: Merge "stagefright: Include stdlib.h for malloc/free"
* commit '
88409911aebed6c3663e51d51fca67f527c0c2fb':
stagefright: Include stdlib.h for malloc/free
Deckard Autoverifier [Mon, 18 Jul 2011 22:38:27 +0000 (15:38 -0700)]
am
eb07c531: Merge "stagefright amrwbenc: Remove a duplicate, unused file"
* commit '
eb07c531498f4dc881ad2b4d1a32cacab25950ff':
stagefright amrwbenc: Remove a duplicate, unused file
Deckard Autoverifier [Mon, 18 Jul 2011 22:38:25 +0000 (15:38 -0700)]
am
c06c3603: Merge "stagefright aacenc: Make the mem_malloc function 64-bit safe"
* commit '
c06c3603e09a85136eb97d1d8ba1a49fcebae93b':
stagefright aacenc: Make the mem_malloc function 64-bit safe
Deckard Autoverifier [Mon, 18 Jul 2011 22:38:22 +0000 (15:38 -0700)]
am
55f115a3: Merge "stagefright: Only use __int64 on MSVC, not on all win32 compilers"
* commit '
55f115a3214343c826acf27fcbc4bf2927049083':
stagefright: Only use __int64 on MSVC, not on all win32 compilers
Deckard Autoverifier [Mon, 18 Jul 2011 22:23:41 +0000 (15:23 -0700)]
Merge "stagefright: Include stdlib.h for malloc/free"
Deckard Autoverifier [Mon, 18 Jul 2011 22:23:31 +0000 (15:23 -0700)]
Merge "stagefright amrwbenc: Remove a duplicate, unused file"
Deckard Autoverifier [Mon, 18 Jul 2011 22:23:20 +0000 (15:23 -0700)]
Merge "stagefright aacenc: Make the mem_malloc function 64-bit safe"
Deckard Autoverifier [Mon, 18 Jul 2011 22:23:09 +0000 (15:23 -0700)]
Merge "stagefright: Only use __int64 on MSVC, not on all win32 compilers"
Conley Owens [Mon, 18 Jul 2011 19:42:42 +0000 (12:42 -0700)]
am
98fcc404: Merge "stagefright aacenc/amrwbenc: Remove trailing whitespace"
* commit '
98fcc4041d35831c7a65a6e2f0e61021e0fb37e2':
stagefright aacenc/amrwbenc: Remove trailing whitespace
Conley Owens [Mon, 18 Jul 2011 19:37:16 +0000 (12:37 -0700)]
Merge "stagefright aacenc/amrwbenc: Remove trailing whitespace"
Jaikumar Ganesh [Wed, 13 Jul 2011 17:22:40 +0000 (10:22 -0700)]
am
53cf7858: Merge "Bluetooth: correcting return value from cancelDiscovery"
* commit '
53cf7858c3fd36082302efdc4d848925bcc0001e':
Bluetooth: correcting return value from cancelDiscovery
Jaikumar Ganesh [Wed, 13 Jul 2011 17:04:19 +0000 (10:04 -0700)]
Merge "Bluetooth: correcting return value from cancelDiscovery"
Robert Greenwalt [Wed, 6 Jul 2011 14:35:02 +0000 (07:35 -0700)]
am
38bb0123: Merge "Added methods to support dns cache per interface"
* commit '
38bb0123b8b9857c3119fd359739daf872f619d6':
Added methods to support dns cache per interface
Robert Greenwalt [Fri, 1 Jul 2011 16:26:50 +0000 (09:26 -0700)]
Merge "Added methods to support dns cache per interface"
Conley Owens [Thu, 30 Jun 2011 15:19:00 +0000 (08:19 -0700)]
am
e06749e1: Merge "Add FLAG_AUTO_CANCEL flag for multiple supl notifications."
* commit '
e06749e14c1fb2d78540cba9548ee3b4b7b3b1d9':
Add FLAG_AUTO_CANCEL flag for multiple supl notifications.
Conley Owens [Thu, 30 Jun 2011 15:11:25 +0000 (08:11 -0700)]
Merge "Add FLAG_AUTO_CANCEL flag for multiple supl notifications."
Jean-Baptiste Queru [Fri, 24 Jun 2011 18:33:46 +0000 (11:33 -0700)]
am
4fea5373: Merge "Add WEBP to the list of Image formats that support Compression."
* commit '
4fea5373d350f5d855408ffaa41206b8fa743c55':
Add WEBP to the list of Image formats that support Compression.
Jean-Baptiste Queru [Fri, 24 Jun 2011 18:28:30 +0000 (11:28 -0700)]
am
f458d5fd: Merge "Tweak for forward-compatibility"
* commit '
f458d5fdb8a48747d6fdd5fd0d0a44a6a8ed89e9':
Tweak for forward-compatibility
Jean-Baptiste Queru [Fri, 24 Jun 2011 18:13:42 +0000 (11:13 -0700)]
Merge "Add WEBP to the list of Image formats that support Compression."
Jean-Baptiste Queru [Fri, 24 Jun 2011 18:08:36 +0000 (11:08 -0700)]
Merge "Tweak for forward-compatibility"
Jean-Baptiste Queru [Fri, 24 Jun 2011 17:49:18 +0000 (10:49 -0700)]
Tweak for forward-compatibility
Change-Id: Ic5e4d949c1c80a2ebdc2ec802c35b5d3d7f9661d
Raphael Moll [Thu, 23 Jun 2011 00:44:29 +0000 (17:44 -0700)]
am
e2b41b0d: Merge "Laoutlib_creator: keep original of delegate methods."
* commit '
e2b41b0d5c8db85a60cd190c7094052db61114b2':
Laoutlib_creator: keep original of delegate methods.
Raphael Moll [Thu, 23 Jun 2011 00:11:27 +0000 (17:11 -0700)]
Merge "Laoutlib_creator: keep original of delegate methods."
Jaikumar Ganesh [Tue, 21 Jun 2011 20:24:46 +0000 (13:24 -0700)]
am
b38fa2a0: Merge "DO NOT MERGE Incoming Bluetooth Connection requests - dialog." into gingerbread
* commit '
b38fa2a0ac2bde56504929de6a3dd61ac723958e':
DO NOT MERGE Incoming Bluetooth Connection requests - dialog.
Jaikumar Ganesh [Tue, 21 Jun 2011 18:23:51 +0000 (11:23 -0700)]
Merge "DO NOT MERGE Incoming Bluetooth Connection requests - dialog." into gingerbread
Nick Pelly [Mon, 20 Jun 2011 22:54:07 +0000 (15:54 -0700)]
am
17523abb: NFC Adapter Extras API update.
* commit '
17523abb45b7f77f35af53e895d74be13f2314e0':
NFC Adapter Extras API update.
Conley Owens [Mon, 20 Jun 2011 20:04:45 +0000 (13:04 -0700)]
am
bf5adfa5: Merge "Check if we are in daylight time when calculating timezone"
* commit '
bf5adfa5e558827fbb4771720433887bb3cbaefd':
Check if we are in daylight time when calculating timezone
Conley Owens [Mon, 20 Jun 2011 18:01:41 +0000 (11:01 -0700)]
Merge "Check if we are in daylight time when calculating timezone"
Jean-Baptiste Queru [Mon, 20 Jun 2011 16:05:07 +0000 (09:05 -0700)]
am
e3b05d09: Merge "Tweaks for forward-compatibility"
* commit '
e3b05d09163257b888c86f2a560e10c48f4cf029':
Tweaks for forward-compatibility
Jean-Baptiste Queru [Sat, 18 Jun 2011 16:45:53 +0000 (09:45 -0700)]
Merge "Tweaks for forward-compatibility"
Jean-Baptiste Queru [Sat, 18 Jun 2011 16:42:04 +0000 (09:42 -0700)]
Tweaks for forward-compatibility
Change-Id: Iec525edc186e78d5d865f82dd5b1f56263c22e86
Maarten Hooft [Thu, 16 Jun 2011 22:48:55 +0000 (15:48 -0700)]
am
d76baeb4: Merge "Import revised Croatian translations." into gingerbread
* commit '
d76baeb4d836c33cc68cbb0c2e237c066f368529':
Import revised Croatian translations.
Maarten Hooft [Thu, 16 Jun 2011 22:41:20 +0000 (15:41 -0700)]
Merge "Import revised Croatian translations." into gingerbread
Irfan Sheriff [Wed, 15 Jun 2011 23:29:02 +0000 (16:29 -0700)]
am
df1734e3: Fix lease duration handling
* commit '
df1734e3f57646df1fa96275cbb65bb91ac9d2ac':
Fix lease duration handling
Mathias Agopian [Wed, 15 Jun 2011 21:13:04 +0000 (14:13 -0700)]
am
afffa8fa: fix RefBase so it retains binary-compatibility with gingerbread (DO NOT MERGE)
* commit '
afffa8fa9f82a7343e1158bf921931fd3e3df615':
fix RefBase so it retains binary-compatibility with gingerbread (DO NOT MERGE)
Marco Nelissen [Wed, 15 Jun 2011 15:33:09 +0000 (08:33 -0700)]
resolved conflicts for merge of
d027329c to gingerbread-plus-aosp
Change-Id: I169c415bf998b9935ab36812511573db05717b91
Mathias Agopian [Mon, 13 Jun 2011 01:05:53 +0000 (18:05 -0700)]
fix RefBase so it retains binary-compatibility with gingerbread (DO NOT MERGE)
Bug:
4595257
Change-Id: I4773cf4fe59b2509db0ed733739eb6961d473b25
Dan Morrill [Sat, 11 Jun 2011 16:52:50 +0000 (09:52 -0700)]
am
8688d470: Moving flag to a member field instead of a stack variable.
* commit '
8688d4708117db446d6ba2855f1d8ad715bb4d72':
Moving flag to a member field instead of a stack variable.
Dan Morrill [Thu, 9 Jun 2011 21:52:40 +0000 (14:52 -0700)]
am
a1a107b8: Merge "Adding a new config value used to tell StatusBarPolicy to always use CDMA signal strength value even when on EVDO. Default is off, but devices that need to can override it." into gingerbread
* commit '
a1a107b8cb8cbb7eea796f375eb72958e8b148e3':
Adding a new config value used to tell StatusBarPolicy to always use CDMA signal strength value even when on EVDO. Default is off, but devices that need to can override it.
Dan Morrill [Thu, 9 Jun 2011 21:43:58 +0000 (14:43 -0700)]
Merge "Adding a new config value used to tell StatusBarPolicy to always use CDMA signal strength value even when on EVDO. Default is off, but devices that need to can override it." into gingerbread
Conley Owens [Thu, 9 Jun 2011 19:14:11 +0000 (12:14 -0700)]
am
d8b027b1: Merge "stagefright aacenc/amrwbenc: Convert line breaks to Unix style"
* commit '
d8b027b18f5a922ef729c6ee363eecb053358d47':
stagefright aacenc/amrwbenc: Convert line breaks to Unix style
Conley Owens [Thu, 9 Jun 2011 18:12:04 +0000 (11:12 -0700)]
Merge "stagefright aacenc/amrwbenc: Convert line breaks to Unix style"
Marco Nelissen [Thu, 9 Jun 2011 17:36:24 +0000 (10:36 -0700)]
am
a02d9bf9: Make sure we don\'t read from invalid fds
* commit '
a02d9bf9c3ff22cd449da21ff7c23170488ebd8e':
Make sure we don't read from invalid fds
Mathias Agopian [Thu, 9 Jun 2011 02:56:06 +0000 (19:56 -0700)]
am
19974ecc: Fix a leak in RefBase (DO NOT MERGE)
* commit '
19974eccdbd3e4dbd7e3b2cc401db7806d4a17bc':
Fix a leak in RefBase (DO NOT MERGE)
Mathias Agopian [Wed, 8 Jun 2011 23:05:30 +0000 (16:05 -0700)]
Fix a leak in RefBase (DO NOT MERGE)
this bug was introduced recently. it caused RefBase's weakref_impl
structure to be leaked for every RefBase object (about 20 bytes).
Change-Id: Ia9b155fbfa643ef72cfb8129e96260a3b806a78c
Jean-Baptiste Queru [Wed, 8 Jun 2011 21:07:19 +0000 (14:07 -0700)]
am
f3894a04: Merge "Tweak setViewport stuff for fwd-compat"
* commit '
f3894a04acb9cdd67a02a1a4c82ba7d178c13000':
Tweak setViewport stuff for fwd-compat
Jean-Baptiste Queru [Wed, 8 Jun 2011 20:10:58 +0000 (13:10 -0700)]
Merge "Tweak setViewport stuff for fwd-compat"
Jake Hamby [Tue, 7 Jun 2011 23:24:15 +0000 (16:24 -0700)]
resolved conflicts for merge of
66040bbb to gingerbread-plus-aosp
Change-Id: Id13750bc01c977ab06accf8ceabc95fe5dee703a
Xavier Ducrohet [Tue, 7 Jun 2011 01:08:40 +0000 (18:08 -0700)]
am
d6ce6791: Merge "Cherrypick
d1ed33c4 from hc-mr1. do not merge." into gingerbread
* commit '
d6ce6791f26fd0a7cf89ded2847011a4894013e1':
Cherrypick
d1ed33c4 from hc-mr1. do not merge.
Xavier Ducrohet [Tue, 7 Jun 2011 01:08:32 +0000 (18:08 -0700)]
am
ee1b4976: Merge changes I035c48b9,Ib302af47,Iebda5ea6 into gingerbread
* commit '
ee1b497648a0c3c03b09c4739619f23315d491fb':
Cherrypick
5b61ea6b from hc-mr1
LayoutLib: enable the LAYOUT_ONLY capability.
Merge
dba35f1b from honeycomb-mr1. do not merge.
Romain Guy [Tue, 7 Jun 2011 00:54:12 +0000 (17:54 -0700)]
am
258f32e2: Merge "Disable plugins if setPluginsEnabled(false) called."
* commit '
258f32e2e3ff7f4f4b1395cae292098141047fde':
Disable plugins if setPluginsEnabled(false) called.
Romain Guy [Mon, 6 Jun 2011 23:23:25 +0000 (16:23 -0700)]
Merge "Disable plugins if setPluginsEnabled(false) called."
Jake Hamby [Mon, 6 Jun 2011 22:33:37 +0000 (15:33 -0700)]
resolved conflicts for merge of
ab79ee4a to gingerbread-plus-aosp
Change-Id: Ib885176060f65ef3286a24c7b9cae1a673666275
Xavier Ducrohet [Sat, 4 Jun 2011 01:53:41 +0000 (18:53 -0700)]
Merge "Cherrypick
d1ed33c4 from hc-mr1. do not merge." into gingerbread
Xavier Ducrohet [Sat, 4 Jun 2011 01:53:23 +0000 (18:53 -0700)]
Merge changes I035c48b9,Ib302af47,Iebda5ea6 into gingerbread
* changes:
Cherrypick
5b61ea6b from hc-mr1
LayoutLib: enable the LAYOUT_ONLY capability.
Merge
dba35f1b from honeycomb-mr1. do not merge.
Andreas Huber [Thu, 2 Jun 2011 14:37:52 +0000 (07:37 -0700)]
am
8050a02b: DO NOT MERGE: Linux sockets are odd, closing a socket descriptor does not abort pending recv/send calls.
* commit '
8050a02b0130f0ba2e2ddfc240aa59029ee2ac6d':
DO NOT MERGE: Linux sockets are odd, closing a socket descriptor does not abort pending recv/send calls.
Martijn Coenen [Wed, 1 Jun 2011 16:51:15 +0000 (09:51 -0700)]
am
0aa1017f: Prevent allocation overflows by corrupt NDEF records.
* commit '
0aa1017f9183bca752c95af72f73120e102ab2d3':
Prevent allocation overflows by corrupt NDEF records.
Jaikumar Ganesh [Fri, 27 May 2011 20:46:50 +0000 (13:46 -0700)]
am
1b755dea: Merge "Remove discoverable timeout handler. DO NOT MERGE" into gingerbread
* commit '
1b755dea38cc428a4adb8b8954bbafaa9c0441fb':
Remove discoverable timeout handler. DO NOT MERGE
Jaikumar Ganesh [Fri, 27 May 2011 20:28:28 +0000 (13:28 -0700)]
Merge "Remove discoverable timeout handler. DO NOT MERGE" into gingerbread
TK MUN [Wed, 25 May 2011 17:42:07 +0000 (10:42 -0700)]
am
94260caf: Allow control over search order for tethering upstream interface selection
* commit '
94260caf2fb3f5dbf6e17b29a269b46ea05f8680':
Allow control over search order for tethering upstream interface selection
Jaikumar Ganesh [Wed, 25 May 2011 16:59:44 +0000 (09:59 -0700)]
am
94062517: Merge "Require bonding and encryption for PBAP server"
* commit '
94062517ae5573f9a1a877a83fe7d8e6d1a2c350':
Require bonding and encryption for PBAP server
Jaikumar Ganesh [Wed, 25 May 2011 16:27:32 +0000 (09:27 -0700)]
Merge "Require bonding and encryption for PBAP server"
Jean-Baptiste Queru [Wed, 25 May 2011 16:04:40 +0000 (09:04 -0700)]
am
038e8f99: Merge "Adding support for parsing of SMS-CB pdus in UMTS format."
* commit '
038e8f99845e171c0d9d606f5697e36b1b684d01':
Adding support for parsing of SMS-CB pdus in UMTS format.
Jean-Baptiste Queru [Wed, 25 May 2011 15:06:17 +0000 (08:06 -0700)]
Merge "Adding support for parsing of SMS-CB pdus in UMTS format."
Simon Wilson [Wed, 25 May 2011 00:29:12 +0000 (17:29 -0700)]
am
c9cd2387: Merge changes I37f0f315,I8cbf6044,Ibb598931,I5262bf11 into gingerbread
* commit '
c9cd2387b6938a6fbefc731d2177902266f2a130':
Fix a race that could cause GL commands to be executed from the wrong thread.
RefBase subclasses can now decide how they want to be destroyed.
Fix a race in SurfaceFlinger that could cause layers to be leaked forever.
Fix a race-condtion in SurfaceFlinger that could lead to a crash.
Simon Wilson [Wed, 25 May 2011 00:07:39 +0000 (17:07 -0700)]
Merge changes I37f0f315,I8cbf6044,Ibb598931,I5262bf11 into gingerbread
* changes:
Fix a race that could cause GL commands to be executed from the wrong thread.
RefBase subclasses can now decide how they want to be destroyed.
Fix a race in SurfaceFlinger that could cause layers to be leaked forever.
Fix a race-condtion in SurfaceFlinger that could lead to a crash.
Conley Owens [Tue, 24 May 2011 22:01:18 +0000 (15:01 -0700)]
am
4cf0eee7: Merge "Fixing concurrency issue on IccPhoneBookInterfaceManager."
* commit '
4cf0eee755046734568959ac01f207b108e449c0':
Fixing concurrency issue on IccPhoneBookInterfaceManager.
Conley Owens [Tue, 24 May 2011 21:05:05 +0000 (14:05 -0700)]
Merge "Fixing concurrency issue on IccPhoneBookInterfaceManager."
Xavier Ducrohet [Tue, 24 May 2011 19:28:38 +0000 (12:28 -0700)]
am
34f5991e: Merge
6103e22c from honeycomb-mr1. do not merge.
* commit '
34f5991ebe8b203f1720caf95889c15dd131d86e':
Merge
6103e22c from honeycomb-mr1. do not merge.
Xavier Ducrohet [Tue, 24 May 2011 17:54:35 +0000 (10:54 -0700)]
am
c7b87766: Merge
2402ad60 from honeycomb-mr1. do not merge.
* commit '
c7b87766b21fe5cf2f644efa8753b936d413dc9a':
Merge
2402ad60 from honeycomb-mr1. do not merge.
Mathias Agopian [Thu, 19 May 2011 22:38:14 +0000 (15:38 -0700)]
Fix a race that could cause GL commands to be executed from the wrong thread.
Bug:
4483050
Change-Id: I37f0f3156059c208c6168ee6131d0e267d823188