ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues 6 Pull Requests Releases Wiki Activity
31,747 Commits 2 Branches 0 Tags 54 MiB
efc7d6eb88
Commit Graph

31747 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Glenn Kasten
2e3c2f0453 am 76470914: Merge "Bug 3515073 Add ANativeWindow_fromSurfaceTexture" into honeycomb-mr1 
* commit '7647091436c45af2d82f12c9ea9ec77fa309b49b':
  Bug 3515073 Add ANativeWindow_fromSurfaceTexture
 2011-03-11 16:34:30 -08:00
Glenn Kasten
9f669c5391 Merge "Bug 3515073 Add ANativeWindow_fromSurfaceTexture" into honeycomb-mr1 2011-03-11 16:31:55 -08:00
Kenny Root
a05c7c2920 am 2fdf829a: Merge "Remove unnecessary SkImageDecoder_libjpeg.cpp" 
* commit '2fdf829a17fdac4e6d65f5a85a69d0ec9cfd0a7d':
  Remove unnecessary SkImageDecoder_libjpeg.cpp
 2011-03-11 15:45:34 -08:00
Nicolas Roard
503c996a4b am c6c311f7: am f0230cca: Merge "HTML5 Video improvements" into honeycomb-mr1 
* commit 'c6c311f77459c3852d4a8c887657f6a135ad4cdf':
  HTML5 Video improvements
 2011-03-11 15:18:46 -08:00
Robert Greenwalt
3bdb000ce7 am 618377d8: Merge "resolved conflicts for merge of 55b53d35 to honeycomb-plus-aosp" into honeycomb-plus-aosp 
* commit '618377d83d4a280c2e0f89642bfb1046d387ad7d':
  Don't accept a user-defined dun-capable connection
 2011-03-11 15:17:44 -08:00
James Dong
bd35d2d88c Merge "A little cleanup in MediaScanner JNI code" 2011-03-11 15:15:40 -08:00
Nicolas Roard
71df979198 am f0230cca: Merge "HTML5 Video improvements" into honeycomb-mr1 
* commit 'f0230cca194c840684bab959856c56725fc40b87':
  HTML5 Video improvements
 2011-03-11 15:11:14 -08:00
Eric Hassold
795f5ccf47 Merge "Default to NONE format in Layer" 2011-03-11 15:08:16 -08:00
Nicolas Roard
52d2b87932 Merge "HTML5 Video improvements" into honeycomb-mr1 2011-03-11 14:35:32 -08:00
James Dong
0f1351ed69 am 68f66b94: Merge "MP3Extractor and MP3 decoder fixes - DO NOT MERGE" into gingerbread 
* commit '68f66b945e7a69549689becd2e656d9056f1e7f5':
  MP3Extractor and MP3 decoder fixes - DO NOT MERGE
 2011-03-11 14:31:37 -08:00
Kenny Root
eb9d908d96 Merge "Remove unnecessary SkImageDecoder_libjpeg.cpp" 2011-03-11 14:22:22 -08:00
Robert Greenwalt
d395d372c1 Merge "resolved conflicts for merge of 55b53d35 to honeycomb-plus-aosp" into honeycomb-plus-aosp 2011-03-11 14:16:18 -08:00
Robert Greenwalt
fce2201da0 resolved conflicts for merge of 55b53d35 to honeycomb-plus-aosp 
Change-Id: I7909f30fa5273693d115fd4b565f6c424c95dcc0
 2011-03-11 14:05:14 -08:00
James Dong
f3f7d3504e Merge "MP3Extractor and MP3 decoder fixes - DO NOT MERGE" into gingerbread 2011-03-11 13:38:02 -08:00
Mike Lockwood
ae9480bb40 am 7e6f519c: am 14c875ea: Merge "Clear default for USB device/accessory when new matching app is installed" into honeycomb-mr1 
* commit '7e6f519c0704321461e256c919b4d554f23a4261':
  Clear default for USB device/accessory when new matching app is installed
 2011-03-11 13:27:56 -08:00
Mike Lockwood
367798e84a am 14c875ea: Merge "Clear default for USB device/accessory when new matching app is installed" into honeycomb-mr1 
* commit '14c875eac750ca096de439225b1a028b1facc58e':
  Clear default for USB device/accessory when new matching app is installed
 2011-03-11 13:26:14 -08:00
Mike Lockwood
fd30a36d99 Merge "Clear default for USB device/accessory when new matching app is installed" into honeycomb-mr1 2011-03-11 13:24:01 -08:00
Joe Malin
2e33c567df am 236d41c7: am 761b8440: am 9f187296: Merge "DOC CHANGE: Fix 4084450 monkeyrunner_concepts" into honeycomb 
* commit '236d41c732f58ca22a1f18480a506302b32157ac':
  DOC CHANGE: Fix 4084450 monkeyrunner_concepts
 2011-03-11 13:14:36 -08:00
Joe Malin
09eaf6019c am 761b8440: am 9f187296: Merge "DOC CHANGE: Fix 4084450 monkeyrunner_concepts" into honeycomb 
* commit '761b84409135641ec27bb828dbd8a1d04a7252fe':
  DOC CHANGE: Fix 4084450 monkeyrunner_concepts
 2011-03-11 13:12:37 -08:00
Joe Malin
6cc95a9743 am 9f187296: Merge "DOC CHANGE: Fix 4084450 monkeyrunner_concepts" into honeycomb 
* commit '9f18729676a58cdfcee98db3329de3397c657d48':
  DOC CHANGE: Fix 4084450 monkeyrunner_concepts
 2011-03-11 13:10:29 -08:00
Joe Malin
447b17ba91 Merge "DOC CHANGE: Fix 4084450 monkeyrunner_concepts" into honeycomb 2011-03-11 13:08:59 -08:00
Eric Hassold
7ffe380750 Default to NONE format in Layer 
mFormat is not initialized with any value in Layer constructor, causing
a call to requestFormat() with no explicit format specified to fallback to
some uninitialized value. Such invalid path actually detected by valgrind.

Change-Id: Ib7faabcd61eaa26fb0ae7a9a486d9e258ba31b63
 2011-03-11 12:24:23 -08:00
Ying Wang
e64fc17f7a am 69e725eb: Merge "Dist com.android.nfc_extras.jar." into gingerbread 
* commit '69e725eb8806180749b66903382754c86a15d0f6':
  Dist com.android.nfc_extras.jar.
 2011-03-11 12:05:22 -08:00
Mike Lockwood
ab4f04fab3 am 75c95e9a: am 0eb7b697: Merge changes Ib63ab95a,I585b0610,Ia84da0b5 into honeycomb-mr1 
* commit '75c95e9a6d5a91b660af62f72b5a3bac0f5c3811':
  UsbManager: Hide APIs not needed for USB host or accessory support.
  Remove MtpClient class from framework and public API
  UsbDevice: Move IO related methods to new UsbDeviceConnection class
 2011-03-11 11:53:13 -08:00
Robert Greenwalt
1b9ff06914 am b5c51d5f: Merge "DO NOT MERGE Backport of I1f55df8a from master." into gingerbread 
* commit 'b5c51d5fa88c56ebbfb56af89beb077aa4f1f2f8':
  DO NOT MERGE Backport of I1f55df8a from master.
 2011-03-11 11:52:31 -08:00
Mike Lockwood
bac02fd025 am 0eb7b697: Merge changes Ib63ab95a,I585b0610,Ia84da0b5 into honeycomb-mr1 
* commit '0eb7b697b7c180660647b5cd0cd7dd067f6b6abb':
  UsbManager: Hide APIs not needed for USB host or accessory support.
  Remove MtpClient class from framework and public API
  UsbDevice: Move IO related methods to new UsbDeviceConnection class
 2011-03-11 11:37:14 -08:00
Christopher Tate
e57e840dd2 am ab1f2a82: am 9856fbd4: Merge "Broaden the filter for wallpaper restore" into honeycomb-mr1 
* commit 'ab1f2a824ba55ac7cabd2a342ab78a798408f44f':
  Broaden the filter for wallpaper restore
 2011-03-11 11:03:30 -08:00
Mike Lockwood
e195b4bc54 Merge changes Ib63ab95a,I585b0610,Ia84da0b5 into honeycomb-mr1 
* changes:
  UsbManager: Hide APIs not needed for USB host or accessory support.
  Remove MtpClient class from framework and public API
  UsbDevice: Move IO related methods to new UsbDeviceConnection class
 2011-03-11 10:57:06 -08:00
Dianne Hackborn
2e5c72d632 am 8657427f: am 7b076307: Merge "Fix issue #4084124: Wingray Often see black screen after market ANR due to 4084121" into honeycomb-mr1 
* commit '8657427f78494df43d129d88f50e0d7375592486':
  Fix issue #4084124: Wingray Often see black screen after market ANR due to 4084121
 2011-03-11 10:51:11 -08:00
Dianne Hackborn
45ef700c20 am 1bada408: am 492eb33d: Merge "Fix issue #4081756: Crash when un-stopping applications" into honeycomb-mr1 
* commit '1bada408f94253c31ae49b1b00ed6263ce0ff229':
  Fix issue #4081756: Crash when un-stopping applications
 2011-03-11 10:51:04 -08:00
Christopher Tate
d3e53c1884 am 9856fbd4: Merge "Broaden the filter for wallpaper restore" into honeycomb-mr1 
* commit '9856fbd40470c9f441b6c38b980210cfdef821e9':
  Broaden the filter for wallpaper restore
 2011-03-11 10:48:46 -08:00
Christopher Tate
6fc20b07d7 Merge "Broaden the filter for wallpaper restore" into honeycomb-mr1 2011-03-11 10:45:17 -08:00
Dianne Hackborn
8d4fb33c6b am 7b076307: Merge "Fix issue #4084124: Wingray Often see black screen after market ANR due to 4084121" into honeycomb-mr1 
* commit '7b076307bb1f78d3f5616b7f2f2ad496aa4a33d7':
  Fix issue #4084124: Wingray Often see black screen after market ANR due to 4084121
 2011-03-11 10:44:46 -08:00
Dianne Hackborn
c9712bba26 am 492eb33d: Merge "Fix issue #4081756: Crash when un-stopping applications" into honeycomb-mr1 
* commit '492eb33d549afa65e630d2f4886b1bdf3d979d04':
  Fix issue #4081756: Crash when un-stopping applications
 2011-03-11 10:44:42 -08:00
Dianne Hackborn
1f8c98d091 Merge "Fix issue #4084124: Wingray Often see black screen after market ANR due to 4084121" into honeycomb-mr1 2011-03-11 10:39:46 -08:00
Dianne Hackborn
3a9c0a05bb Merge "Fix issue #4081756: Crash when un-stopping applications" into honeycomb-mr1 2011-03-11 10:38:52 -08:00
Ying Wang
71d6c882b4 Merge "Dist com.android.nfc_extras.jar." into gingerbread 2011-03-11 10:17:49 -08:00
Robert Greenwalt
f0e9794de9 Merge "DO NOT MERGE Backport of I1f55df8a from master." into gingerbread 2011-03-11 10:14:28 -08:00
Andreas Huber
6a7c4ecc6d Merge "Only use ChromiumHTTPDataSource if webkit was built with chromium support." 2011-03-11 10:11:03 -08:00
Gilles Debunne
dd9e542e9e Merge "Refactor in TextView's HandleViews." 2011-03-11 09:45:35 -08:00
David Li
1305ac5a4c Merge "GLES2Debugger: Added DbgContext and vertex data capturing." 2011-03-11 09:45:35 -08:00
Glenn Kasten
6686201dae am 055066e1: am 92f2f3ff: Merge "Bug 3012968 DRM output control" into honeycomb-mr1 
* commit '055066e1e77d944383360d50057f5b8187f23c0b':
  Bug 3012968 DRM output control
 2011-03-11 08:46:40 -08:00
Glenn Kasten
afada75e27 am 92f2f3ff: Merge "Bug 3012968 DRM output control" into honeycomb-mr1 
* commit '92f2f3ff2ea5c5b474722f2055cfee4916010e26':
  Bug 3012968 DRM output control
 2011-03-11 08:44:35 -08:00
Glenn Kasten
2ee08a1694 Merge "Bug 3012968 DRM output control" into honeycomb-mr1 2011-03-11 08:43:05 -08:00
Mike Lockwood
6786cae1c4 am 4135cb8e: am 364903ba: Merge "Support for USB accessory URIs" into honeycomb-mr1 
* commit '4135cb8e43846e422bf760fd9b856c67cc4ec8f7':
  Support for USB accessory URIs
 2011-03-11 06:06:52 -08:00
Mike Lockwood
ef22134e3b am 364903ba: Merge "Support for USB accessory URIs" into honeycomb-mr1 
* commit '364903bac6b9bfde694f1c0c5c40b6a2af628408':
  Support for USB accessory URIs
 2011-03-11 06:02:57 -08:00
Mike Lockwood
1fc8136de0 Merge "Support for USB accessory URIs" into honeycomb-mr1 2011-03-11 05:56:50 -08:00
Jim Miller
0d48d59988 am 7b7a8ca6: (-s ours) am 352987e0: Merge "Fix 3201849: Enable hardware acceleration in LockScreen WaveView [DO NOT MERGE]" into honeycomb-mr1 
* commit '7b7a8ca615723ea2a8075962775ef753918ea3f1':
  Fix 3201849: Enable hardware acceleration in LockScreen WaveView [DO NOT MERGE]
 2011-03-10 23:03:10 -08:00
Jim Miller
860a931587 am 352987e0: Merge "Fix 3201849: Enable hardware acceleration in LockScreen WaveView [DO NOT MERGE]" into honeycomb-mr1 
* commit '352987e0889b6fa8862f489bc31ba7e9de8d1cbe':
  Fix 3201849: Enable hardware acceleration in LockScreen WaveView [DO NOT MERGE]
 2011-03-10 23:01:42 -08:00
Jim Miller
21daa912d8 Merge "Fix 3201849: Enable hardware acceleration in LockScreen WaveView [DO NOT MERGE]" into honeycomb-mr1 2011-03-10 22:59:57 -08:00