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

24522 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mike Lockwood
755fd61725 Prototype Content Provider support for MTP/PTP devices. 
At this point much of the plumbing is in place, but only a few simple queries
are supported.
This is enough to support a proof of concept sample program that navigates
the file hierarchy of a digital camera connected via USB.

Also removed obsolete ptptest host test program.

Change-Id: I17644344b9f0ce1ecc302bc0478c1f3d44a1647f
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2010-06-01 22:12:44 -04:00
Romain Guy
a393a85d2b Fix build warnings about improper ASCII encoding. 
Change-Id: I5f26278e74a0a7018059db75ca44a36c42c559f3
 2010-06-01 14:06:24 -07:00
Derek Sollenberger
3af4a2c6bb Merge "eoving Zoom animation logic from WebView into ZoomManager. This is pick bad5ede Revert "Refactor the on-screen zoom controls into a separate class."" 2010-06-01 13:52:17 -07:00
Vasu Nori
7e6eaa9a90 Merge "set sqlite pagesize to the size, in bytes, of a block on "/data"" 2010-06-01 13:12:01 -07:00
Vasu Nori
a8c24904eb set sqlite pagesize to the size, in bytes, of a block on "/data" 
Change-Id: I40b2bdac348a611eb9fe12ea05b6bd9a87f2310a
 2010-06-01 13:03:32 -07:00
Derek Sollenberger
87b17be55e eoving Zoom animation logic from WebView into ZoomManager. This is 
pick bad5ede Revert "Refactor the on-screen zoom controls into a separate class."

one part of a series of CL's that is intended to refactor all zoom
logic into the ZoomManager.

Change-Id: I6260c7d2daade4861df1296c9db364ee2a892bd0
http://b/2671604
 2010-06-01 15:03:53 -04:00
Grace Kloba
c8f302fb5d Merge "merge two restore scale to one." 2010-06-01 10:19:59 -07:00
Shimeng (Simon) Wang
06c40631ff Merge "Add English hyphenation dictionary into frameworks/base asset." 2010-06-01 10:05:47 -07:00
Christopher Tate
20b2637675 am 0ec783da: am 009668bf: am 5c9d9949: am 6ee412d5: Also dump system process threads halfway through the watchdog interval 2010-05-30 21:20:43 -07:00
Jason Sams
3678f1989e Merge "Rough implemetation of ForEach. Remove launchID from root graphics script." 2010-05-28 18:24:49 -07:00
Jason Sams
f17bccc905 Rough implemetation of ForEach. 
Remove launchID from root graphics script.

Change-Id: I9f80c0d4df1264f2ee1624a6d7216b9dfdf8502e
 2010-05-28 18:23:22 -07:00
Jason Sams
12fc0af972 Merge "Fountain update. Update field names to match legacy expectations. Cleanup java code." 2010-05-28 18:16:16 -07:00
Jason Sams
96d3749e4e Fountain update. Update field names to match legacy expectations. 
Cleanup java code.

Change-Id: I1ad9ae462e46166a7b6ff2b399417dbfe50a5542
 2010-05-28 18:14:41 -07:00
Grace Kloba
e80cbcc051 merge two restore scale to one. 
There is a matching CL in external/webkit
 2010-05-28 18:07:50 -07:00
Shimeng (Simon) Wang
bcf8591c85 Add English hyphenation dictionary into frameworks/base asset. 
issue: 2672163
Change-Id: Idf3ff164f41ae95448519b14666f03fb59dada97
 2010-05-28 16:25:08 -07:00
Brian Carlstrom
40ac2e6d57 Merge "Merge remote branch 'goog/dalvik-dev' into dalvik-dev-to-master" 2010-05-28 14:32:43 -07:00
Christopher Tate
0ec783dade am 009668bf: am 5c9d9949: am 6ee412d5: Also dump system process threads halfway through the watchdog interval 2010-05-28 12:54:58 -07:00
Christopher Tate
009668bf8a am 5c9d9949: am 6ee412d5: Also dump system process threads halfway through the watchdog interval 
Merge commit '5c9d99496dab7a5cfe7cd37df749075ec9b4421b' into kraken

* commit '5c9d99496dab7a5cfe7cd37df749075ec9b4421b':
  Also dump system process threads halfway through the watchdog interval
 2010-05-28 12:52:43 -07:00
Christopher Tate
5c9d99496d am 6ee412d5: Also dump system process threads halfway through the watchdog interval 
Merge commit '6ee412d51d8b601580cfb4b7be4f676b7ec76afd' into froyo-plus-aosp

* commit '6ee412d51d8b601580cfb4b7be4f676b7ec76afd':
  Also dump system process threads halfway through the watchdog interval
 2010-05-28 12:50:05 -07:00
Christopher Tate
6ee412d51d Also dump system process threads halfway through the watchdog interval 
This gives us a snapshot of what the system process was doing after 30 seconds
of apparent inactivity as well as after 1 minute, to help distinguishing actual
deadlocks from too-slow progress, livelock, etc.

Change-Id: I19758861d1b25f298e88788e8f1c7ec7bf828823
 2010-05-28 12:23:16 -07:00
James Dong
5f95da7a17 am 46e70361: am 46441198: Merge "Avoid copying for input recording frames in CameraSource" into kraken 2010-05-28 11:05:59 -07:00
James Dong
46e703610f am 46441198: Merge "Avoid copying for input recording frames in CameraSource" into kraken 2010-05-28 11:01:48 -07:00
James Dong
464411983a Merge "Avoid copying for input recording frames in CameraSource" into kraken 2010-05-28 10:53:09 -07:00
James Dong
dfb1dd6a8c Avoid copying for input recording frames in CameraSource 
This is the part one.

- Let CameraSource be a MediaBufferObserver. It releases the recording frame when the ref count of a MediaBuffer containing
  the recording frame drops to 0.

  This reduces the CPU load from 90+% down to 50-60%.

Part two is related to the avoidance of copying the input video frames to the video encoder.
However, we are not able to use OMX_UseBuffer directly. Still work on the second part.

Change-Id: I906f1d054ae8bdcf82e1617f1fc120152f2eb2eb
 2010-05-28 10:44:20 -07:00
Mike Lockwood
8eb25c28c0 Merge "Move CursorWindow class from core/jni to libbinder" 2010-05-28 10:24:29 -07:00
Wu-cheng Li
9222832882 am 3ed1da35: am 198975bb: Merge "Add video frame parameter." into kraken 2010-05-28 09:35:20 -07:00
Mathias Agopian
cf78921436 am 6a9d88ff: am 64ff6ab4: Merge "more clean-up of Surfaceflinger\'s client management" into kraken 2010-05-28 09:35:08 -07:00
Mike Lockwood
2807df89af Move CursorWindow class from core/jni to libbinder 
To allow use of the native CursorWindow class outside of the core framework jni

Change-Id: I72e8dcb91a2c691130c33cdfd9a25d343da1c592
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2010-05-28 10:08:21 -04:00
Wu-cheng Li
3ed1da3580 am 198975bb: Merge "Add video frame parameter." into kraken 2010-05-28 04:36:29 -07:00
Wu-cheng Li
198975bb01 Merge "Add video frame parameter." into kraken 2010-05-28 04:34:13 -07:00
Wu-cheng Li
d2c2929c94 Add video frame parameter. 
The image format of preview frames and video frames may be different.
We need another parameter for video frame format.

bug:2720893
Change-Id: I966a31b0ce8cab25cdde65db65a18c8cbe9c7bd6
 2010-05-28 17:32:41 +08:00
Brian Carlstrom
f77cf7f0f0 Merge remote branch 'goog/dalvik-dev' into dalvik-dev-to-master 
Note that the api/9.xml change is removing APIs that were removed going from RI 5 to RI 6

Change-Id: I665a30c4fdc2ca73c3ade0ad7487aa85cebf272f
 2010-05-27 23:11:20 -07:00
Kenny Root
8e98e35e8f am 50239de1: am ddbab4e1: am 6cc13745: am 94f1751c: Merge "Fix typo in EastAsianWidth javadoc" into froyo 2010-05-27 23:05:47 -07:00
Dirk Dougherty
c0e58245bc am 527c8b18: am 75ef3197: am 9eae9572: am 9f95c64e: Merge "Doc change: Add ADL 2Q10 slide decks to shareables directory. Remove latest_samples.zip from shareables." into froyo 2010-05-27 23:05:42 -07:00
Andreas Huber
56a72f80b8 am 2b4bc19e: am 1a35e612: Merge "Better sniffing of MPEG4 content by checking for a compatible sub-brand." into kraken 2010-05-27 23:05:21 -07:00
Mathias Agopian
6a9d88ff64 am 64ff6ab4: Merge "more clean-up of Surfaceflinger\'s client management" into kraken 2010-05-27 20:05:20 -07:00
Mathias Agopian
64ff6ab4df Merge "more clean-up of Surfaceflinger's client management" into kraken 2010-05-27 20:04:05 -07:00
Mathias Agopian
c7b388c2b3 more clean-up of Surfaceflinger's client management 
SurfaceComposerClient now only exist on the WindowManager side,
the client side uses the new SurfaceClient class, which only
exposes what a client needs.

also instead of keeping mappings from IBinder to SurfaceComposerClients
we have a SurfaceClient per Surface (referring to the same IBinder), this
is made possible by the fact that SurfaceClient is very light.

Change-Id: I6a1f7015424f07871632a25ed6a502c55abfcfa6
 2010-05-27 19:55:43 -07:00
Adam Powell
39d4dbc4fe Merge "Recycle MotionEvents for ACTION_OUTSIDE in WindowManagerService" 2010-05-27 18:56:18 -07:00
Adam Powell
47482969bb Recycle MotionEvents for ACTION_OUTSIDE in WindowManagerService 
Change-Id: I648e5ad780cad285f190e06cfff1780c6dad0117
 2010-05-27 18:52:59 -07:00
Konstantin Lopyrev
a15dcfaf2b Fix 2677197: Adding minimum complex character support. 
Change-Id: I520bc5f9aa924bf9b5585b2235a91cc96cb99c25
 2010-05-27 15:27:06 -07:00
Joe Malin
afd52a0b40 Merge "DOC CHANGE: Clean up the concepts topic testing_android.jd" 2010-05-27 13:10:54 -07:00
Kenny Root
50239de1a7 am ddbab4e1: am 6cc13745: am 94f1751c: Merge "Fix typo in EastAsianWidth javadoc" into froyo 2010-05-27 12:39:20 -07:00
Dirk Dougherty
527c8b184c am 75ef3197: am 9eae9572: am 9f95c64e: Merge "Doc change: Add ADL 2Q10 slide decks to shareables directory. Remove latest_samples.zip from shareables." into froyo 2010-05-27 12:39:16 -07:00
Kenny Root
ddbab4e165 am 6cc13745: am 94f1751c: Merge "Fix typo in EastAsianWidth javadoc" into froyo 
Merge commit '6cc137459a21e67765d2490529a920ccfb14e362' into kraken

* commit '6cc137459a21e67765d2490529a920ccfb14e362':
  Fix typo in EastAsianWidth javadoc
 2010-05-27 12:37:28 -07:00
Dirk Dougherty
75ef31976e am 9eae9572: am 9f95c64e: Merge "Doc change: Add ADL 2Q10 slide decks to shareables directory. Remove latest_samples.zip from shareables." into froyo 
Merge commit '9eae957207c016db032819eadef261addf994a0d' into kraken

* commit '9eae957207c016db032819eadef261addf994a0d':
  Doc change: Add ADL 2Q10 slide decks to shareables directory. Remove latest_samples.zip from shareables.
 2010-05-27 12:37:22 -07:00
Kenny Root
6cc137459a am 94f1751c: Merge "Fix typo in EastAsianWidth javadoc" into froyo 
Merge commit '94f1751cb0c6ea4004ff86b3af89e06e00a66641' into froyo-plus-aosp

* commit '94f1751cb0c6ea4004ff86b3af89e06e00a66641':
  Fix typo in EastAsianWidth javadoc
 2010-05-27 12:35:25 -07:00
Dirk Dougherty
9eae957207 am 9f95c64e: Merge "Doc change: Add ADL 2Q10 slide decks to shareables directory. Remove latest_samples.zip from shareables." into froyo 
Merge commit '9f95c64e66df7481b1c624c6cf29569ca384a822' into froyo-plus-aosp

* commit '9f95c64e66df7481b1c624c6cf29569ca384a822':
  Doc change: Add ADL 2Q10 slide decks to shareables directory. Remove latest_samples.zip from shareables.
 2010-05-27 12:35:18 -07:00
Leon Scroggins
acea08d20f Prevent a null pointer exception. 
Bug 2721268

Change-Id: I3a9e838ed3f2f9dccdf7b4bf42a0dbad58e62e02
 2010-05-27 15:09:32 -04:00
Kenny Root
94f1751cb0 Merge "Fix typo in EastAsianWidth javadoc" into froyo 2010-05-27 12:04:34 -07:00