Kobi Cohen Arazi
0d11baf889
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)
2011-04-15 10:38:33 -07:00
Kenny Root
d59b5d0087
Merge "Runtime resource overlay, iteration 1."
2011-04-11 10:07:15 -07:00
Brad Fitzpatrick
fb3f51702d
Merge "audioflinger: Enable ARMv5TE optimized resampler"
2011-04-07 08:57:00 -07:00
Brad Fitzpatrick
5e29d67d7c
Merge "Fix data corruption when writing to Bluetooth socket"
2011-04-04 10:49:05 -07:00
Brad Fitzpatrick
9f3c59adc5
Merge "Always return a valid index from Rfc822Tokenizer.findTokenEnd()"
2011-04-04 09:41:10 -07:00
Brad Fitzpatrick
7ac7f79133
Merge "Avoid crash in system server when mounting container"
2011-04-04 09:38:16 -07:00
Mårten Kongstad
5f29c87ef2
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
2011-04-01 14:12:10 +02:00
Russell Brenner
0686717d79
Updated JBQ's original SurfaceTexture stubs to make webkit MR1 buildable
...
Change-Id: If1c1610efcc0e0bc6de88c75712baed91624b1a7
2011-03-31 17:40:08 -07:00
The Android Open Source Project
1a1b70fbfa
Merge from gingerbread
...
Change-Id: I31e3da083b642d5c7cf6332095fa228b840ee7bb
2011-03-29 13:54:43 -07:00
Michael I. Gold
894c1459c1
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
2011-03-29 13:43:54 -07:00
Brad Fitzpatrick
13e41db3a1
Merge "Error in compound cache-control header."
2011-03-29 08:55:02 -07:00
Brad Fitzpatrick
199f567fc7
Merge "Handle OutOfMemoryError when decoding images in ThumbnailUtils"
2011-03-28 08:13:08 -07:00
Brad Fitzpatrick
a57bf3d09b
Merge "Unregister callback from binder when vibration is removed"
2011-03-28 07:59:08 -07:00
Brad Fitzpatrick
2fc222d9cf
Merge "Making it possible to call SIP calls with special allowed chars."
2011-03-23 12:33:39 -07:00
Brad Fitzpatrick
eb6bc968dd
Merge "Fixing the wrong link in YuvImage JavaDoc."
2011-03-23 12:30:28 -07:00
Brad Fitzpatrick
64069d47d8
Merge "Removing dead store; it was likely a relict of debuging code."
2011-03-17 09:51:47 -07:00
Brad Fitzpatrick
dce27d58b5
Merge "Releasing lock even if exception is thrown."
2011-03-15 11:23:44 -07:00
Brad Fitzpatrick
6c8eb099e4
Merge "Lazy initialization must be synchronized to avoid parallel instances cretation."
2011-03-15 11:22:43 -07:00
Brad Fitzpatrick
3b2122f9a2
Merge "Removing self-assignment statement."
2011-03-15 11:19:23 -07:00
Brad Fitzpatrick
47c8e50c57
Merge "Fixing self-assignment in copying code."
2011-03-15 11:18:18 -07:00
Brad Fitzpatrick
03af2d42a4
Merge "Fixing self-assignment in cloning code."
2011-03-15 11:15:19 -07:00
Brad Fitzpatrick
201c38b39c
Merge "Removing repetitive conditional; it simply does nothing except slowing down things."
2011-03-15 11:13:01 -07:00
Brad Fitzpatrick
9860849b8d
Merge "Removing repetitive conditional; it simply does nothing except slowing down things."
2011-03-15 11:12:15 -07:00
Brad Fitzpatrick
5a98e39e1c
Merge "Fixing improper boxing to Integer instead of Long."
2011-03-15 11:03:29 -07:00
Brad Fitzpatrick
d42a9b74bc
Merge "Using proper key for removing object from the map."
2011-03-15 11:00:51 -07:00
Brad Fitzpatrick
c53163a4a3
Merge changes I81fc2f90,I5e7fd759
...
* changes:
Using proper key for removing from map.
Removing wrong equals method in comparator.
2011-03-15 10:56:16 -07:00
Kenny Root
eb9d908d96
Merge "Remove unnecessary SkImageDecoder_libjpeg.cpp"
2011-03-11 14:22:22 -08:00
Dianne Hackborn
5b18439050
am 62619392: Merge "Fix leak when keylock is recreated."
...
* commit '626193926df0b3c7236e5c244f30d797d9192e0d':
Fix leak when keylock is recreated.
2011-02-28 18:03:12 -08:00
Dianne Hackborn
b00d5d94d6
Merge "Fix leak when keylock is recreated."
2011-02-28 17:54:54 -08:00
Jaikumar Ganesh
03100c7446
am 1eefb529: Merge "Phone crash when old callback func is woken up when enabling BT."
...
* commit '1eefb529c78be5336f6c8a1b8ac2c32e268d4294':
Phone crash when old callback func is woken up when enabling BT.
2011-02-28 16:00:01 -08:00
Jaikumar Ganesh
51e164ad73
Merge "Phone crash when old callback func is woken up when enabling BT."
2011-02-28 15:33:34 -08:00
Jean-Baptiste Queru
3da332d6fa
am e0537f18: Merge "Fix of tearDown() in SingleLaunchActivityTestCase."
...
* commit 'e0537f1859664ba9c9cf87eb9d6dc3c16986dbb8':
Fix of tearDown() in SingleLaunchActivityTestCase.
2011-02-28 10:15:46 -08:00
Jean-Baptiste Queru
f9d33557e7
Merge "Fix of tearDown() in SingleLaunchActivityTestCase."
2011-02-28 10:12:08 -08:00
Xavier Ducrohet
4256fef269
am dff6b8e7: Merge "Add --non-constant-id to aapt."
...
* commit 'dff6b8e71dda9f5d841fa26408714aec2aef1505':
GpsLocationProvider: Clean up HAL initialization/cleanup sequence
Fixed GSM encoded network initiated position request
Ensuring thread-safe usage of DateFormat.
Fixing infinite loop for zero duration.
Fix for an infinite loop while scrolling lists.
WAPPushManager, WAP Push over SMS message handler
Add --non-constant-id to aapt.
2011-02-28 09:16:38 -08:00
Xavier Ducrohet
281cc9c8c0
Merge "Add --non-constant-id to aapt."
2011-02-24 15:59:26 -08:00
Wink Saville
e5ee1b5add
Merge "WAPPushManager, WAP Push over SMS message handler"
2011-02-23 17:40:43 -08:00
Mike Lockwood
d5372b93e9
Merge "GpsLocationProvider: Clean up HAL initialization/cleanup sequence"
2011-02-23 16:27:27 -08:00
Brad Fitzpatrick
34bfec131d
Merge "Fixed GSM encoded network initiated position request"
2011-02-23 08:17:31 -08:00
Elliott Hughes
ddd5975296
Merge "Ensuring thread-safe usage of DateFormat."
2011-02-22 11:16:04 -08:00
Brad Fitzpatrick
a1ca28f78a
Merge "Fix for an infinite loop while scrolling lists."
2011-02-22 10:55:44 -08:00
Brad Fitzpatrick
55d0e988b0
Merge "Fixing infinite loop for zero duration."
2011-02-22 08:23:23 -08:00
Romain Guy
d4cd30cbcf
am 7118bdec: Merge "Fix for #12945 : ProgressBar.setMax() will always redraw."
...
* commit '7118bdec523568842e70555e353951df9f2596fd':
Fix for #12945 : ProgressBar.setMax() will always redraw.
2011-02-18 07:53:50 -08:00
Romain Guy
2151cef42c
Merge "Fix for #12945 : ProgressBar.setMax() will always redraw."
2011-02-17 22:40:33 -08:00
Robert Ly
6619488871
am 322891c6: Doc change: nfc dev guide
...
* commit '322891c689c845b5aa63dbca606967eb9f8f900b':
Doc change: nfc dev guide
2011-02-11 13:18:31 -08:00
Jean-Baptiste Queru
fd32f41763
am 6901f963: am 93552de8: Merge "stubs"
...
* commit '6901f963c27f2d0a9caf56b42b6054d0cecc84d1':
stubs
2011-02-11 10:04:53 -08:00
Jean-Baptiste Queru
a240734bae
am 93552de8: Merge "stubs"
...
* commit '93552de8e305027fb003401e347b9493c64c981f':
stubs
2011-02-11 09:54:59 -08:00
Jean-Baptiste Queru
3edab5a44e
Merge "stubs"
2011-02-11 09:39:46 -08:00
Steve Block
58c40337d0
stubs
...
Change-Id: I6bc0b8e9d4412a0b60c6226fbd2b7a6d15aceb22
2011-02-11 09:33:40 -08:00
Gilles Debunne
4dffae1718
am 2050de5b: Text selection is broken.
...
* commit '2050de5b9a5c097e30545ab822211d49031bd9dc':
Text selection is broken.
2011-02-09 16:49:42 -08:00
Wink Saville
614a618526
am 01a5eba8: am 6e25789f: Merge "Telephony: Fix cb sms implementation"
...
* commit '01a5eba810bfdf5b111a7546814e174c1d57b6e7':
Telephony: Fix cb sms implementation
2011-02-09 13:45:37 -08:00