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

47065 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mathias Agopian
f0ff906fa4 Fix some const-ness and comments 
mDrawingState doesn't need to be accessed by the
mStateLock, because by definition it's only accessed
from the main thread.

Similarily, the list of layers in the drawing state
cannot change (ie: is const).

Change-Id: I2e5da7f4d8caee7af7802b432cd45cc81c7c08b0
 2011-03-11 17:01:40 -08:00
Mathias Agopian
ccf94df600 Fix initialization order warning. 
Change-Id: I794dfaaa3a2f2645a89abc6c45de5f76e485f7d0
 2011-03-11 17:01:40 -08:00
Nicolas Roard
9a3595c2c8 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
66a09d0a17 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
d96d1be7bd Merge "A little cleanup in MediaScanner JNI code" 2011-03-11 15:15:40 -08:00
Nicolas Roard
c6c311f774 am f0230cca: Merge "HTML5 Video improvements" into honeycomb-mr1 
* commit 'f0230cca194c840684bab959856c56725fc40b87':
  HTML5 Video improvements
 2011-03-11 15:11:14 -08:00
Eric Hassold
f667740d28 Merge "Default to NONE format in Layer" 2011-03-11 15:08:16 -08:00
Nicolas Roard
f0230cca19 Merge "HTML5 Video improvements" into honeycomb-mr1 2011-03-11 14:35:32 -08:00
Nicolas Roard
0e778a1ab0 HTML5 Video improvements 
- add support for the fullscreen button

counterpart webkit CL: https://android-git.corp.google.com/g/#change,101484

bug:2126902
Change-Id: Ibcc8c5b115089ad1f30ebe76e4d5c31b2d6389f9
 2011-03-11 14:29:05 -08:00
Robert Greenwalt
618377d83d 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
fe99eb7548 resolved conflicts for merge of 55b53d35 to honeycomb-plus-aosp 
Change-Id: I7909f30fa5273693d115fd4b565f6c424c95dcc0
 2011-03-11 14:05:14 -08:00
Chih-Wei Huang
4c1ac4e665 Remove unnecessary SkImageDecoder_libjpeg.cpp 
Adding files outside $(LOCAL_PATH) is a bad idea. It generates output files
to an unexpected directory. In this case, it's

out/target/external/skia/src/images/SkImageDecoder_libjpeg.o

It's not in $(PRODUCT_OUT), which is not correct.
Worse, it makes the build system be unable to build different
architectures (arm and x86) simultaneously, since the output files
conflcit.

Seems we can just remove SkImageDecoder_libjpeg.cpp since it's
already in libskia.

Change-Id: Ia0ed72d8a6cbd3b2f3997b71dfdcf72fee50f5bb
 2011-03-11 14:02:39 -08:00
James Dong
f399752858 A little cleanup in MediaScanner JNI code 
o mainly use the defined class name rather than repeat the string each time
  to reduce the typo chance.
o format the code also

Change-Id: I131c98f11335ff524d01a6791baa1b8c11013abc
 2011-03-11 13:36:28 -08:00
Mike Lockwood
f25a7964a3 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
7e6f519c07 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
14c875eac7 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
aa4c99c61f 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
236d41c732 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
Mike Lockwood
c7d32d1065 Clear default for USB device/accessory when new matching app is installed 
Bug: 4063041

Change-Id: Ia1b4f29d3e54ec21aa64407720d9d5db62855380
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-03-11 16:12:07 -05:00
Joe Malin
761b844091 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
9f18729676 Merge "DOC CHANGE: Fix 4084450 monkeyrunner_concepts" into honeycomb 2011-03-11 13:08:59 -08:00
Eric Hassold
b6c0f51d6a 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
Mike Lockwood
b46ecb3526 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
Mike Lockwood
75c95e9a6d 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
08758fad84 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
0eb7b697b7 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
9ebdd66465 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
d3ac49889e 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
ab1f2a824b 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
9856fbd404 Merge "Broaden the filter for wallpaper restore" into honeycomb-mr1 2011-03-11 10:45:17 -08:00
Dianne Hackborn
8657427f78 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
1bada408f9 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
7b076307bb 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
492eb33d54 Merge "Fix issue #4081756: Crash when un-stopping applications" into honeycomb-mr1 2011-03-11 10:38:52 -08:00
Andreas Huber
bc529b7f5d Merge "Only use ChromiumHTTPDataSource if webkit was built with chromium support." 2011-03-11 10:11:03 -08:00
Andreas Huber
92b94c7f97 Only use ChromiumHTTPDataSource if webkit was built with chromium support. 
Change-Id: I9ce16f4aae35c61c9fb92fefc2a7c72537631cba
 2011-03-11 10:07:19 -08:00
Gilles Debunne
05bb0105bf Merge "Refactor in TextView's HandleViews." 2011-03-11 09:45:35 -08:00
David Li
dda1b7f972 Merge "GLES2Debugger: Added DbgContext and vertex data capturing." 2011-03-11 09:45:35 -08:00
Glenn Kasten
6dd429efe2 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
055066e1e7 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
92f2f3ff2e Merge "Bug 3012968 DRM output control" into honeycomb-mr1 2011-03-11 08:43:05 -08:00
Mike Lockwood
a75075e167 UsbManager: Hide APIs not needed for USB host or accessory support. 
Bug: 4067029

Change-Id: Ib63ab95a6571d6a691834bfb583a68d2e4cfd22e
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-03-11 11:26:38 -05:00
Mike Lockwood
c72eb9113a Remove MtpClient class from framework and public API 
After reviewing this class I decided it would be best not to include it in the public API
since it adds no functionality that cannot be done using MtpDevice and other APIs directly.
So I am moving it to the CameraBrowser sample instead.

Also changed CameraBrowser to build against the SDK to ensure all the necessary APIs for
PTP support have been made public.

Bug: 4067029

Change-Id: I585b06104084953176d018ced08bba0cb4607490
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-03-11 10:55:44 -05:00
Mike Lockwood
acc29cc91b UsbDevice: Move IO related methods to new UsbDeviceConnection class 
UsbDevice is now just an immutable parcelable object like UsbInterface and
UsbEndpoint.
All IO related functionality is now contained in UsbDeviceConnection
and UsbRequest.

Bug: 4067029

Change-Id: Ia84da0b512a697acc940eee0c3566711c62e1a68
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-03-11 10:24:21 -05:00
Mike Lockwood
dd0f9af116 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
4135cb8e43 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
364903bac6 Merge "Support for USB accessory URIs" into honeycomb-mr1 2011-03-11 05:56:50 -08:00
Jim Miller
fd3c852a09 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
7b7a8ca615 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
352987e088 Merge "Fix 3201849: Enable hardware acceleration in LockScreen WaveView [DO NOT MERGE]" into honeycomb-mr1 2011-03-10 22:59:57 -08:00