OSDN Git Service
Conley Owens [Fri, 29 Apr 2011 06:52:45 +0000 (23:52 -0700)]
am
e1787009: Merge "Added null check on return value for getKeyDispatcherState()"
* commit '
e17870092941cecf64956819d395ec34111cbe71':
Added null check on return value for getKeyDispatcherState()
Conley Owens [Fri, 29 Apr 2011 06:52:41 +0000 (23:52 -0700)]
am
501f7bca: Merge "Eliminating dead logic - bitmap state simply cannot be null here."
* commit '
501f7bca83ecc2200a590966e461590d9716df7d':
Eliminating dead logic - bitmap state simply cannot be null here.
Conley Owens [Fri, 29 Apr 2011 06:52:37 +0000 (23:52 -0700)]
am
11d7ec24: Merge "Removing unnecessary computation."
* commit '
11d7ec24a55319b68bcc96443372c263a41b7dc5':
Removing unnecessary computation.
Conley Owens [Fri, 29 Apr 2011 06:52:32 +0000 (23:52 -0700)]
am
e41d2aed: Merge "Using robust equality check."
* commit '
e41d2aed9c8d990d31af70642ae688dad1d8fb4b':
Using robust equality check.
Conley Owens [Fri, 29 Apr 2011 06:52:26 +0000 (23:52 -0700)]
am
1e29552b: Merge "We don\'t need these local references."
* commit '
1e29552bd5feeb24952a0486e3263396978212df':
We don't need these local references.
Conley Owens [Fri, 29 Apr 2011 06:52:21 +0000 (23:52 -0700)]
am
da882181: Merge "Eliminating dead code with no other effect than consuming battery life."
* commit '
da882181245fdf3eca827680d656cd298c9c318f':
Eliminating dead code with no other effect than consuming battery life.
Conley Owens [Thu, 28 Apr 2011 22:07:00 +0000 (15:07 -0700)]
Merge "Added null check on return value for getKeyDispatcherState()"
Conley Owens [Thu, 28 Apr 2011 21:57:14 +0000 (14:57 -0700)]
Merge "Eliminating dead logic - bitmap state simply cannot be null here."
Conley Owens [Thu, 28 Apr 2011 21:57:11 +0000 (14:57 -0700)]
Merge "Removing unnecessary computation."
Conley Owens [Thu, 28 Apr 2011 21:57:08 +0000 (14:57 -0700)]
Merge "Using robust equality check."
Conley Owens [Thu, 28 Apr 2011 21:56:59 +0000 (14:56 -0700)]
Merge "We don't need these local references."
Conley Owens [Thu, 28 Apr 2011 21:56:55 +0000 (14:56 -0700)]
Merge "Eliminating dead code with no other effect than consuming battery life."
Conley Owens [Thu, 28 Apr 2011 19:00:53 +0000 (12:00 -0700)]
am
e6e3322a: am
8fff7805: Merge "Remove duplicate \'=\' in exception message"
* commit '
e6e3322a3baef4cce7d382a7890718a805c4bd3b':
Remove duplicate '=' in exception message
Conley Owens [Thu, 28 Apr 2011 18:57:48 +0000 (11:57 -0700)]
am
8fff7805: Merge "Remove duplicate \'=\' in exception message"
* commit '
8fff7805ab1ccde8321697116ed3dd2fae5340ed':
Remove duplicate '=' in exception message
Conley Owens [Thu, 28 Apr 2011 18:46:39 +0000 (11:46 -0700)]
Merge "Remove duplicate '=' in exception message"
Eric Fischer [Wed, 27 Apr 2011 22:30:36 +0000 (15:30 -0700)]
am
a4e7353d: Import revised translations. DO NOT MERGE
* commit '
a4e7353d33a0736361c866db76008a66ad8fbf8a':
Import revised translations. DO NOT MERGE
Conley Owens [Wed, 27 Apr 2011 21:53:26 +0000 (14:53 -0700)]
am
a6590e7f: am
13b21e60: Merge "Auto hide virtual keyboard"
* commit '
a6590e7fee1ef4286f0896358593fdb9aab24f6c':
Auto hide virtual keyboard
Conley Owens [Wed, 27 Apr 2011 21:53:15 +0000 (14:53 -0700)]
am
cfe7b9fc: am
a538b4a2: Merge "onDetachedFromWindow is called before onAttachedToWindow"
* commit '
cfe7b9fcfaeda1e79a8673e4005bcb307f9e9313':
onDetachedFromWindow is called before onAttachedToWindow
Conley Owens [Wed, 27 Apr 2011 21:53:10 +0000 (14:53 -0700)]
am
779fa151: am
4a4d96e7: Merge changes I0ab47e2f,Ib8016996
* commit '
779fa1515d0b6cf17a449dc79f83a7c4e70ff0fe':
Remove errant tag terminator
Normalize output of XMLtree content
Conley Owens [Wed, 27 Apr 2011 20:53:46 +0000 (13:53 -0700)]
am
13b21e60: Merge "Auto hide virtual keyboard"
* commit '
13b21e608e47382cb94a0aeac13b24ac97f355d2':
Auto hide virtual keyboard
Conley Owens [Wed, 27 Apr 2011 20:53:37 +0000 (13:53 -0700)]
am
a538b4a2: Merge "onDetachedFromWindow is called before onAttachedToWindow"
* commit '
a538b4a206c54ef763dab4da00990a8991425e77':
onDetachedFromWindow is called before onAttachedToWindow
Conley Owens [Wed, 27 Apr 2011 20:48:45 +0000 (13:48 -0700)]
am
4a4d96e7: Merge changes I0ab47e2f,Ib8016996
* commit '
4a4d96e7ee682167861434cba05531f04642bf97':
Remove errant tag terminator
Normalize output of XMLtree content
Conley Owens [Wed, 27 Apr 2011 20:20:16 +0000 (13:20 -0700)]
Merge "Auto hide virtual keyboard"
Conley Owens [Wed, 27 Apr 2011 20:14:57 +0000 (13:14 -0700)]
Merge "onDetachedFromWindow is called before onAttachedToWindow"
Conley Owens [Wed, 27 Apr 2011 20:06:46 +0000 (13:06 -0700)]
Merge changes I0ab47e2f,Ib8016996
* changes:
Remove errant tag terminator
Normalize output of XMLtree content
Conley Owens [Wed, 27 Apr 2011 19:46:09 +0000 (12:46 -0700)]
am
f0556bb9: am
86d1d747: Merge "Add lock before calling initEglImage"
* commit '
f0556bb90ff38be96c6099f5efafe386cd7f1083':
Add lock before calling initEglImage
Conley Owens [Wed, 27 Apr 2011 19:43:19 +0000 (12:43 -0700)]
am
86d1d747: Merge "Add lock before calling initEglImage"
* commit '
86d1d74762e65b6f64c2d4758aa5fd4af6275696':
Add lock before calling initEglImage
Conley Owens [Wed, 27 Apr 2011 19:28:05 +0000 (12:28 -0700)]
Merge "Add lock before calling initEglImage"
Conley Owens [Wed, 27 Apr 2011 19:18:03 +0000 (12:18 -0700)]
am
30d59fa9: Ignore fix for startup NPE as file is deleted.
* commit '
30d59fa90ffa1f19674f21596175ccb5fd8febd2':
Fix for startup NPE.
Conley Owens [Wed, 27 Apr 2011 19:09:31 +0000 (12:09 -0700)]
Ignore fix for startup NPE as file is deleted.
Change-Id: Ifcedb4cc14b7079b03f585218c8c29b8f5d96d20
Conley Owens [Wed, 27 Apr 2011 18:40:46 +0000 (11:40 -0700)]
Merge "Fix for startup NPE."
Nick Pelly [Wed, 27 Apr 2011 01:04:02 +0000 (18:04 -0700)]
am
cc9ee72b: Implement dead service recovery in NFC extras library.
* commit '
cc9ee72bd42bb40b1852f907f58305adde12ecc2':
Implement dead service recovery in NFC extras library.
Conley Owens [Tue, 26 Apr 2011 22:50:33 +0000 (15:50 -0700)]
am
bf4769c7: am
17ba30b5: Merge "Load mnc/mcc configuration value from SIM (KDDI-CDMA)"
* commit '
bf4769c7da5dd39499c2c5dc4413a7f5d6ad88a5':
Load mnc/mcc configuration value from SIM (KDDI-CDMA)
Conley Owens [Tue, 26 Apr 2011 22:46:32 +0000 (15:46 -0700)]
am
17ba30b5: Merge "Load mnc/mcc configuration value from SIM (KDDI-CDMA)"
* commit '
17ba30b549a847f3aab854173a9484851f694453':
Load mnc/mcc configuration value from SIM (KDDI-CDMA)
Conley Owens [Tue, 26 Apr 2011 21:36:48 +0000 (14:36 -0700)]
Merge "Load mnc/mcc configuration value from SIM (KDDI-CDMA)"
Kenny Root [Tue, 26 Apr 2011 18:41:31 +0000 (11:41 -0700)]
am
bb10986c: am
13ce221e: Merge "libutils: Fix an improper const-cast in RefBase"
* commit '
bb10986c3d7493eaa3cd16042c8e6dae4769a071':
libutils: Fix an improper const-cast in RefBase
Kenny Root [Tue, 26 Apr 2011 18:32:22 +0000 (11:32 -0700)]
am
13ce221e: Merge "libutils: Fix an improper const-cast in RefBase"
* commit '
13ce221e4316f7956ba072e774a7b97646e5d99b':
libutils: Fix an improper const-cast in RefBase
Kenny Root [Tue, 26 Apr 2011 18:26:33 +0000 (11:26 -0700)]
Merge "libutils: Fix an improper const-cast in RefBase"
Jean-Baptiste Queru [Tue, 26 Apr 2011 08:20:37 +0000 (01:20 -0700)]
am
5fcfce96: am
4b72eec3: Merge "Re-assingning local variable if mStringBlocks was initialized here. NPE is thrown otherwise."
* commit '
5fcfce965f1380ee7e151c1df75b247dd42b349e':
Re-assingning local variable if mStringBlocks was initialized here. NPE is thrown otherwise.
Irfan Sheriff [Tue, 26 Apr 2011 08:01:31 +0000 (01:01 -0700)]
am
d2127c43: Handle DHCP renewal and wakeup in framework
* commit '
d2127c438fc858a4f6c8ad75b7a1e4491da69a78':
Handle DHCP renewal and wakeup in framework
Jean-Baptiste Queru [Tue, 26 Apr 2011 07:39:44 +0000 (00:39 -0700)]
am
4b72eec3: Merge "Re-assingning local variable if mStringBlocks was initialized here. NPE is thrown otherwise."
* commit '
4b72eec34c983abb7a3afcbadd74d3bd807c4765':
Re-assingning local variable if mStringBlocks was initialized here. NPE is thrown otherwise.
Jean-Baptiste Queru [Mon, 25 Apr 2011 20:33:37 +0000 (13:33 -0700)]
Merge "Re-assingning local variable if mStringBlocks was initialized here. NPE is thrown otherwise."
Josh Stone [Fri, 22 Apr 2011 18:13:35 +0000 (11:13 -0700)]
libutils: Fix an improper const-cast in RefBase
Under Fedora 15 Beta, gcc 4.6.0 warns:
frameworks/base/libs/utils/RefBase.cpp: In member function
‘void android::RefBase::weakref_type::trackMe(bool, bool)’:
frameworks/base/libs/utils/RefBase.cpp:483:67: error: passing
‘const android::RefBase::weakref_impl’ as ‘this’ argument of
‘void android::RefBase::weakref_impl::trackMe(bool, bool)’
discards qualifiers [-fpermissive]
trackMe is not a const function, so don't use const in the static_cast
to a weakref_impl pointer.
Change-Id: I3c9ba73eb127985f5f54197ffecf2939c50f632c
Jaikumar Ganesh [Tue, 19 Apr 2011 22:57:24 +0000 (15:57 -0700)]
am
c34c88b9: am
ec1a8f7a: Merge "Unable to push files to Windows 7"
* commit '
c34c88b948cb60c057bd2145df9f1b2091f3c894':
Unable to push files to Windows 7
Jaikumar Ganesh [Tue, 19 Apr 2011 22:28:26 +0000 (15:28 -0700)]
am
ec1a8f7a: Merge "Unable to push files to Windows 7"
* commit '
ec1a8f7aa7e71e292ef813b1e886a9e26e3635af':
Unable to push files to Windows 7
Jaikumar Ganesh [Tue, 19 Apr 2011 21:48:08 +0000 (14:48 -0700)]
Merge "Unable to push files to Windows 7"
Andreas Huber [Mon, 18 Apr 2011 22:39:09 +0000 (15:39 -0700)]
am
f0f1ceeb: DO NOT MERGE: Make sure we restart the prefetcher immediately when trying to satisfy a read.
* commit '
f0f1ceeb517ff226532a407da6d55602f195e5b5':
DO NOT MERGE: Make sure we restart the prefetcher immediately when trying to satisfy a read.
Kobi Cohen Arazi [Fri, 15 Apr 2011 17:38:33 +0000 (10:38 -0700)]
Add lock before calling initEglImage
Without that lock, there is a chance of race condition
where while composing a specific index, requestBuf with
the same index can be executed and touch the
same data that is being used in initEglImage.
(e.g. dirty flag in texture)
Eric Fischer [Tue, 12 Apr 2011 20:02:15 +0000 (13:02 -0700)]
am
71a556f2: Import revised translations. DO NOT MERGE
* commit '
71a556f24e2b8d489bf81b22fab6fe5e99a9eae0':
Import revised translations. DO NOT MERGE
Kenny Root [Mon, 11 Apr 2011 22:33:19 +0000 (15:33 -0700)]
am
08d9d9a4: Merge "Runtime resource overlay, iteration 1."
* commit '
08d9d9a46250c4fad66e9b637e8898a3524c4286':
Runtime resource overlay, iteration 1.
Kenny Root [Mon, 11 Apr 2011 17:07:15 +0000 (10:07 -0700)]
Merge "Runtime resource overlay, iteration 1."
Brad Fitzpatrick [Thu, 7 Apr 2011 16:08:58 +0000 (09:08 -0700)]
am
ca7ad44a: Merge "audioflinger: Enable ARMv5TE optimized resampler"
* commit '
ca7ad44a8b6764b5935143bfe55700cbddb0d990':
audioflinger: Enable ARMv5TE optimized resampler
Brad Fitzpatrick [Thu, 7 Apr 2011 15:57:00 +0000 (08:57 -0700)]
Merge "audioflinger: Enable ARMv5TE optimized resampler"
Xavier Ducrohet [Thu, 7 Apr 2011 02:08:11 +0000 (19:08 -0700)]
am
59aad78e: LayoutLib: don\'t render when shader\'s local matrix is set to 0 scale.
* commit '
59aad78eae14939c169876b2f632d005f382cf7d':
LayoutLib: don't render when shader's local matrix is set to 0 scale.
Xavier Ducrohet [Thu, 7 Apr 2011 02:08:02 +0000 (19:08 -0700)]
Mike Lockwood [Mon, 4 Apr 2011 21:43:06 +0000 (14:43 -0700)]
am
43707a83: UsbManager: minor Javadoc tweak
* commit '
43707a83ec12957fb84a406276a38fbaf4e23fd3':
UsbManager: minor Javadoc tweak
Jason parks [Mon, 4 Apr 2011 21:42:54 +0000 (14:42 -0700)]
am
78a9766b: Merge "Implement teardown script." into gingerbread
* commit '
78a9766be2a08e1f6a448bdb336f2afeff71a52b':
Implement teardown script.
Jeff Hamilton [Mon, 4 Apr 2011 21:42:44 +0000 (14:42 -0700)]
am
84d34078: Make the NFC UID forward compatible.
* commit '
84d340781b1e148ead9fb4790755737c9dcc1cde':
Make the NFC UID forward compatible.
James Dong [Mon, 4 Apr 2011 21:42:05 +0000 (14:42 -0700)]
am
ea5d2c58: Merge "When read() from AudioRecord returns 0 or negative value, report an error to application. DO NOT MERGE." into gingerbread
* commit '
ea5d2c584490424be6bbc27dec58b4f9868d631e':
When read() from AudioRecord returns 0 or negative value, report an error to application. DO NOT MERGE.
Eric Laurent [Mon, 4 Apr 2011 19:25:37 +0000 (12:25 -0700)]
am
a482d83c: Merge "Issue
4157048: mic gain for VoIP/SIP calls." into gingerbread
* commit '
a482d83ccf35ccd6cc29a9e1ace3d77b5f28d013':
Issue
4157048: mic gain for VoIP/SIP calls.
Mike Lockwood [Mon, 4 Apr 2011 19:25:33 +0000 (12:25 -0700)]
am
a8731e1e: Merge "DO NOT MERGE: UsbService: Make USB disconnect handling for accessory mode more robust" into gingerbread
* commit '
a8731e1e922512e5c22485e48059f33b61ab93ea':
DO NOT MERGE: UsbService: Make USB disconnect handling for accessory mode more robust
Trevor Johns [Mon, 4 Apr 2011 19:25:29 +0000 (12:25 -0700)]
am
cafbe87d: Merge "Fixing line in Market IAB docs that explains how to bind to the MarketService." into gingerbread
* commit '
cafbe87d5b6108d71e85950796b587f95d00cfac':
Fixing line in Market IAB docs that explains how to bind to the MarketService.
Simon Wilson [Mon, 4 Apr 2011 19:25:25 +0000 (12:25 -0700)]
am
ec944728: Merge "DO NOT MERGE Disable WiMAX when "Data Enabled" is off" into gingerbread
* commit '
ec94472835787b66e1799110411d5077d0ef37cd':
DO NOT MERGE Disable WiMAX when "Data Enabled" is off
Eric Fischer [Mon, 4 Apr 2011 19:20:38 +0000 (12:20 -0700)]
am
8b312c6c: Merge "Import revised translations. DO NOT MERGE" into gingerbread
* commit '
8b312c6ca1c3f6dc4bec0c7d45bc9509afef4984':
Import revised translations. DO NOT MERGE
Jason parks [Mon, 4 Apr 2011 19:20:33 +0000 (12:20 -0700)]
am
cca2f2f9: Merge "Send out a broadcast that the system is being factory reset." into gingerbread
* commit '
cca2f2f987ab772a4bae3176df7259f59d6502ce':
Send out a broadcast that the system is being factory reset.
Justin Ho [Mon, 4 Apr 2011 19:19:39 +0000 (12:19 -0700)]
am
87805ca3: Updated CDMA roaming icons
* commit '
87805ca3a477e165891baa18efe5239a70d11bc9':
Updated CDMA roaming icons
Jean-Baptiste Queru [Mon, 4 Apr 2011 19:19:26 +0000 (12:19 -0700)]
am
bef31431: No-op - reconcile with open-source gingerbread
* commit '
bef31431cafe100e382a3caf7ea7dce343832d68':
Robert Greenwalt [Mon, 4 Apr 2011 19:18:58 +0000 (12:18 -0700)]
am
27725e8c: Only leave one default network up at a time.
* commit '
27725e8cd1e2eb3b88186ae8d43e437f130b1f84':
Only leave one default network up at a time.
Robert Greenwalt [Mon, 4 Apr 2011 18:23:51 +0000 (11:23 -0700)]
Merge "resolved conflicts for merge of
7544b23e to gingerbread-plus-aosp" into gingerbread-plus-aosp
Robert Greenwalt [Mon, 4 Apr 2011 18:21:23 +0000 (11:21 -0700)]
resolved conflicts for merge of
7544b23e to gingerbread-plus-aosp
Change-Id: I28cf91f473eb9e3e758129b2f4d89827e73049dd
Brad Fitzpatrick [Mon, 4 Apr 2011 18:03:03 +0000 (11:03 -0700)]
am
9907d161: Merge "Fix data corruption when writing to Bluetooth socket"
* commit '
9907d161584415c81de1099678f160da172fd1a6':
Fix data corruption when writing to Bluetooth socket
Brad Fitzpatrick [Mon, 4 Apr 2011 17:49:05 +0000 (10:49 -0700)]
Merge "Fix data corruption when writing to Bluetooth socket"
Brad Fitzpatrick [Mon, 4 Apr 2011 17:17:43 +0000 (10:17 -0700)]
am
2ed72048: Merge "Always return a valid index from Rfc822Tokenizer.findTokenEnd()"
* commit '
2ed72048828cf9f617da971e5d2b8a062de08e5b':
Always return a valid index from Rfc822Tokenizer.findTokenEnd()
Brad Fitzpatrick [Mon, 4 Apr 2011 17:17:35 +0000 (10:17 -0700)]
am
e558a000: Merge "Avoid crash in system server when mounting container"
* commit '
e558a0000389a2523b8d3d3a787db6b4579d2bdc':
Avoid crash in system server when mounting container
Brad Fitzpatrick [Mon, 4 Apr 2011 16:41:10 +0000 (09:41 -0700)]
Merge "Always return a valid index from Rfc822Tokenizer.findTokenEnd()"
Brad Fitzpatrick [Mon, 4 Apr 2011 16:38:16 +0000 (09:38 -0700)]
Merge "Avoid crash in system server when mounting container"
Jason parks [Fri, 1 Apr 2011 20:11:06 +0000 (13:11 -0700)]
Merge "Implement teardown script." into gingerbread
Mårten Kongstad [Thu, 17 Mar 2011 13:13:41 +0000 (14:13 +0100)]
Runtime resource overlay, iteration 1.
Runtime resource overlay allows unmodified applications to appear
as if they had been compiled with additional resources defined. See
libs/utils/README for more information.
This commit is the first iteration of runtime resource overlay. It
provides the actual overlay modifications and loading of trusted overlay
packages (ie residing in /vendor) targeting framework-res.apk.
This commit loads exactly one overlay package. The overlay,
if present, must target framework-res.apk and be located at
/vendor/overlay/framework/framework-res.apk.
Change-Id: If26ee7754813004a96c043dba37fbe99fa3919db
Russell Brenner [Fri, 1 Apr 2011 01:55:26 +0000 (18:55 -0700)]
am
c6b22e27: Updated JBQ\'s original SurfaceTexture stubs to make webkit MR1 buildable
* commit '
c6b22e2727bd3730edd5ad72831a9bb4670d00f3':
Updated JBQ's original SurfaceTexture stubs to make webkit MR1 buildable
Russell Brenner [Fri, 1 Apr 2011 01:55:20 +0000 (18:55 -0700)]
am
49b49f8f: Added include/private/hwui/DrawGlInfo.h
* commit '
49b49f8fb6d094768d4e093353b34271f2da1bfc':
Added include/private/hwui/DrawGlInfo.h
Russell Brenner [Fri, 1 Apr 2011 00:32:20 +0000 (17:32 -0700)]
Updated JBQ's original SurfaceTexture stubs to make webkit MR1 buildable
Change-Id: If1c1610efcc0e0bc6de88c75712baed91624b1a7
James Dong [Thu, 31 Mar 2011 18:20:40 +0000 (11:20 -0700)]
Merge "When read() from AudioRecord returns 0 or negative value, report an error to application. DO NOT MERGE." into gingerbread
Eric Laurent [Wed, 30 Mar 2011 21:55:49 +0000 (14:55 -0700)]
Merge "Issue
4157048: mic gain for VoIP/SIP calls." into gingerbread
Mike Lockwood [Wed, 30 Mar 2011 21:15:51 +0000 (14:15 -0700)]
Merge "DO NOT MERGE: UsbService: Make USB disconnect handling for accessory mode more robust" into gingerbread
Trevor Johns [Wed, 30 Mar 2011 20:50:40 +0000 (13:50 -0700)]
Merge "Fixing line in Market IAB docs that explains how to bind to the MarketService." into gingerbread
Simon Wilson [Wed, 30 Mar 2011 20:26:45 +0000 (13:26 -0700)]
Merge "DO NOT MERGE Disable WiMAX when "Data Enabled" is off" into gingerbread
Eric Fischer [Wed, 30 Mar 2011 17:41:05 +0000 (10:41 -0700)]
Merge "Import revised translations. DO NOT MERGE" into gingerbread
Jeff Hamilton [Wed, 30 Mar 2011 16:30:40 +0000 (09:30 -0700)]
am
96cf34d3: Merge "Make STOP_APP_SWITCHES signatureOrSystem." into gingerbread
* commit '
96cf34d362a1666683e813af915e4f6e0d1b38a0':
Make STOP_APP_SWITCHES signatureOrSystem.
Irfan Sheriff [Wed, 30 Mar 2011 16:30:32 +0000 (09:30 -0700)]
am
05f14e2b: Merge "DO NOT MERGE Pick upstream intf with valid IP conf" into gingerbread
* commit '
05f14e2bcf78be62b35e85902408ea66103a3881':
DO NOT MERGE Pick upstream intf with valid IP conf
Robert Greenwalt [Wed, 30 Mar 2011 16:30:15 +0000 (09:30 -0700)]
am
568845a7: Merge "Fix some alt-network issues." into gingerbread
* commit '
568845a766cddc4e4c222b4d9de064f8a48da990':
Fix some alt-network issues.
Jason parks [Wed, 30 Mar 2011 15:17:53 +0000 (08:17 -0700)]
Merge "Send out a broadcast that the system is being factory reset." into gingerbread
The Android Open Source Project [Tue, 29 Mar 2011 22:23:08 +0000 (15:23 -0700)]
am
ad663d80: Merge from gingerbread
* commit '
ad663d8040ddd4f3e537117847f20d42797b429e':
egl: fixes for object refcounts
Jean-Baptiste Queru [Tue, 29 Mar 2011 21:05:30 +0000 (14:05 -0700)]
No-op - reconcile with open-source gingerbread
Change-Id: I64beb8dfb6f175eb9a160f1145dad3dc323fc98e
The Android Open Source Project [Tue, 29 Mar 2011 20:54:35 +0000 (13:54 -0700)]
Merge from gingerbread
Change-Id: I31e3da083b642d5c7cf6332095fa228b840ee7bb
Michael I. Gold [Thu, 23 Dec 2010 21:51:36 +0000 (13:51 -0800)]
egl: fixes for object refcounts
eglMakeCurrent() would only deref the previous surfaces if the old and
new contexts were the same. eglTerminate() should not touch TLS.
eglReleaseThread() needs to unbind the current context.
Change-Id: I7f4c090a287ee1e29e4708ae10679fb9d7d8c8c5
Related-Bug:
2964479
Brad Fitzpatrick [Tue, 29 Mar 2011 16:27:16 +0000 (09:27 -0700)]
am
1e7fb7ae: Merge "Error in compound cache-control header."
* commit '
1e7fb7aed7b00cebc8f0e501c911727af6527523':
Error in compound cache-control header.
Brad Fitzpatrick [Tue, 29 Mar 2011 15:55:02 +0000 (08:55 -0700)]
Merge "Error in compound cache-control header."
Brad Fitzpatrick [Mon, 28 Mar 2011 15:26:02 +0000 (08:26 -0700)]
am
f0dbf00d: Merge "Handle OutOfMemoryError when decoding images in ThumbnailUtils"
* commit '
f0dbf00d37c349e8c615045876d6bc89b6bb8c54':
Handle OutOfMemoryError when decoding images in ThumbnailUtils
Brad Fitzpatrick [Mon, 28 Mar 2011 15:15:35 +0000 (08:15 -0700)]
am
1a5a2379: Merge "Unregister callback from binder when vibration is removed"
* commit '
1a5a2379eb3a6cf16fb153aecbc4ac9e85d3ed42':
Unregister callback from binder when vibration is removed
Brad Fitzpatrick [Mon, 28 Mar 2011 15:13:08 +0000 (08:13 -0700)]
Merge "Handle OutOfMemoryError when decoding images in ThumbnailUtils"