summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Cleanup GL setup code and remove legacy 1.1 paths.Jason Sams2010-09-1616-128/+31
| | | | | | Reset pointers to NULL when allocations are unbound. Change-Id: Ifaba634ecbb154970b7fb47faa8e6475d16d2f66
* Fix race condition on exit.Jason Sams2010-09-161-1/+5
| | | | Change-Id: I1ae1818122604dde5993b2b8ef702bda5194d87d
* Merge "Initial Video Editor API"Gil Dobjanschi2010-09-1621-0/+4328
|\
| * Initial Video Editor APIGil Dobjanschi2010-09-1621-0/+4328
| | | | | | | | Change-Id: Iaa91e78d0e50f45ceb943bab93c4f1ea1bdee003
* | Merge "Snap layer bounds to pixel boundaries."Romain Guy2010-09-162-0/+9
|\ \
| * | Snap layer bounds to pixel boundaries.Romain Guy2010-09-162-0/+9
| | | | | | | | | | | | Change-Id: I272ceebf469a119f01ea9d73cdd68519afdffa99
* | | Merge "Better error handling in the OpenGL renderer."Romain Guy2010-09-166-8/+52
|\ \ \ | |/ /
| * | Better error handling in the OpenGL renderer.Romain Guy2010-09-166-8/+52
| | | | | | | | | | | | | | | | | | | | | Add a glGetError() check on every frame Don't attempt to create textures larger than the maximum size allowed Change-Id: Iee4afae16089406dbe8bf10fc93b674f1271a0ca
* | | Add YUV420P color format support for video output from camera halJames Dong2010-09-163-2/+9
| | | | | | | | | | | | Change-Id: I5c8266348d0840361c8095ce351ac85c44d4068f
* | | Merge "change error message on cl I392875b62ed270741633f5bffa519932e4a9f985"Vasu Nori2010-09-161-2/+2
|\ \ \
| * | | change error message on cl I392875b62ed270741633f5bffa519932e4a9f985Vasu Nori2010-09-161-2/+2
| | | | | | | | | | | | | | | | Change-Id: I9eaf201822a9efd8afbdf5cd0e7ef2f01749b955
* | | | Merge branch 'master' of ssh://android-git:29418/platform/frameworks/baseSteve Howard2010-09-161-2/+1
|\ \ \ \
| * \ \ \ Merge "Make javadoc warnings into errors."Joe Onorato2010-09-161-2/+1
| |\ \ \ \
| | * | | | Make javadoc warnings into errors.Joe Onorato2010-09-161-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ic2f98ffcc1568db5a3d5d97dd30de9d6dbfaf602
* | | | | | am 4cd34abe: am 47874718: Merge "Support new URI structure for download ↵Steve Howard2010-09-162-14/+51
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | provider." into gingerbread Merge commit '4cd34abe538ea1da4aba8685ef6c8dc6c3e4947b' * commit '4cd34abe538ea1da4aba8685ef6c8dc6c3e4947b': Support new URI structure for download provider.
| * | | | | am 47874718: Merge "Support new URI structure for download provider." into ↵Steve Howard2010-09-162-14/+51
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gingerbread Merge commit '478747181e0414d703076d4786b201718cd93d5b' into gingerbread-plus-aosp * commit '478747181e0414d703076d4786b201718cd93d5b': Support new URI structure for download provider.
| | * \ \ \ \ Merge "Support new URI structure for download provider." into gingerbreadSteve Howard2010-09-162-14/+51
| | |\ \ \ \ \
| | | * | | | | Support new URI structure for download provider.Steve Howard2010-09-152-14/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I'm changing the URI structure for the download provider a bit. The download provider will now support two views into its data: * content://downloads/my_downloads... will basically be the current view, which is limited to downloads owned by the calling UID * content://downloads/all_downloads... will include all downloads in the system, but will require special permission In addition to making things more clear, this change will allow for granting URI permissions to individual downloads via the /all_downloads/... URI. This change includes the framework changes necessary to support the new structure. The bulk of the work will be in the DownloadProvider code itself. In addition, this change makes DownloadManager return a content URI rather than a file URI for /cache downloads. This avoids any confusion in clients, which wouldn't be able to open the file directly, and better supports granting permissions to viewers. Change-Id: Ie548b927817ac774111990dd0c9d26aaf979d1ea
* | | | | | | | Merge "Fix broken javadoc."Joe Onorato2010-09-164-9/+11
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | |
| * | | | | | | Fix broken javadoc.Joe Onorato2010-09-164-9/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I4729ebee36117f281af613e0b49f70d7dee5f334
* | | | | | | | Merge "There is no @note javadoc tag."Joe Onorato2010-09-161-5/+5
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | / / / | |_|_|_|/ / / |/| | | | | |
| * | | | | | There is no @note javadoc tag.Joe Onorato2010-09-161-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I6fb9f695426f958f35c30dab3426765effaabeb8
* | | | | | | am 61cf67a2: am 24326f72: Merge "Input API review." into gingerbreadJeff Brown2010-09-166-53/+256
|\ \ \ \ \ \ \ | |/ / / / / / |/| / / / / / | |/ / / / / | | | | | | | | | | | | | | | | | | Merge commit '61cf67a220ba3205737c646c1c836a92074220de' * commit '61cf67a220ba3205737c646c1c836a92074220de': Input API review.
| * | | | | am 24326f72: Merge "Input API review." into gingerbreadJeff Brown2010-09-166-53/+256
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '24326f7223275ba9c85014b86d42040e3a7d2815' into gingerbread-plus-aosp * commit '24326f7223275ba9c85014b86d42040e3a7d2815': Input API review.
| | * | | | Merge "Input API review." into gingerbreadJeff Brown2010-09-166-53/+256
| | |\ \ \ \
| | | * | | | Input API review.Jeff Brown2010-09-146-53/+256
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Drop currently unsupported input features. Add documentation comments. Change-Id: I407d2e1dd90c5ee82983a3ccf177430d35ee7592
* | | | | | | am 9284b454: am b9eb949b: Merge "Fix input dispatcher regression on launcher ↵Jeff Brown2010-09-161-49/+30
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | drag&drop." into gingerbread Merge commit '9284b454e28a49f514f9caddaace15b91d41165c' * commit '9284b454e28a49f514f9caddaace15b91d41165c': Fix input dispatcher regression on launcher drag&drop.
| * | | | | | am b9eb949b: Merge "Fix input dispatcher regression on launcher drag&drop." ↵Jeff Brown2010-09-161-49/+30
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into gingerbread Merge commit 'b9eb949bcae977a3f86e8307f3854f157227c34c' into gingerbread-plus-aosp * commit 'b9eb949bcae977a3f86e8307f3854f157227c34c': Fix input dispatcher regression on launcher drag&drop.
| | * | | | | Merge "Fix input dispatcher regression on launcher drag&drop." into gingerbreadJeff Brown2010-09-161-49/+30
| | |\ \ \ \ \
| | | * | | | | Fix input dispatcher regression on launcher drag&drop.Jeff Brown2010-09-161-49/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I40e937bd712cd2ed6cceac95dfd1b8c8e070724f
* | | | | | | | am 390490e4: (-s ours) am ad7bce4c: Merge "DO NOT MERGE - Doclava warnings ↵Joe Onorato2010-09-160-0/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | are now errors." into gingerbread Merge commit '390490e4ae768d541018038c782c52b471bb61de' * commit '390490e4ae768d541018038c782c52b471bb61de': DO NOT MERGE - Doclava warnings are now errors.
| * | | | | | | am ad7bce4c: Merge "DO NOT MERGE - Doclava warnings are now errors." into ↵Joe Onorato2010-09-161-2/+2
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gingerbread Merge commit 'ad7bce4ca236393cc2d9ab115cea5a267724f10c' into gingerbread-plus-aosp * commit 'ad7bce4ca236393cc2d9ab115cea5a267724f10c': DO NOT MERGE - Doclava warnings are now errors.
| | * | | | | | Merge "DO NOT MERGE - Doclava warnings are now errors." into gingerbreadJoe Onorato2010-09-161-2/+2
| | |\ \ \ \ \ \
| | | * | | | | | DO NOT MERGE - Doclava warnings are now errors.Joe Onorato2010-09-161-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I688d8f66829d8526d76c321427dd701fbe8d1792
* | | | | | | | | am e30d039f: am a7f5e476: Merge "Fixed a bug in the query to the supported ↵James Dong2010-09-161-2/+5
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | profiles and levels" into gingerbread Merge commit 'e30d039f0ef797c35dd9f75e590f0b819c1c6194' * commit 'e30d039f0ef797c35dd9f75e590f0b819c1c6194': Fixed a bug in the query to the supported profiles and levels
| * | | | | | | | am a7f5e476: Merge "Fixed a bug in the query to the supported profiles and ↵James Dong2010-09-161-2/+5
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | levels" into gingerbread Merge commit 'a7f5e476d54e6f7da588909d370580c3e3457e9b' into gingerbread-plus-aosp * commit 'a7f5e476d54e6f7da588909d370580c3e3457e9b': Fixed a bug in the query to the supported profiles and levels
| | * | | | | | | Merge "Fixed a bug in the query to the supported profiles and levels" into ↵James Dong2010-09-161-2/+5
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gingerbread
| | | * | | | | | | Fixed a bug in the query to the supported profiles and levelsJames Dong2010-09-161-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | According to OMX spec, the levels returned is the max level settings. In fact, we could not enum all the levels. Change-Id: Ib1cba74100512800a5761c7567894c7ea5b5a452
* | | | | | | | | | am 62d4ebc0: am 49e1ae22: Merge "Sometimes the avc software decoder will ↵Andreas Huber2010-09-161-4/+11
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | signal that a frame is ready but then unexpectedly fail to return the frame... stop asserting on that and return an error instead." into gingerbread Merge commit '62d4ebc0423831dfd8165d359e5b809f00f60656' * commit '62d4ebc0423831dfd8165d359e5b809f00f60656': Sometimes the avc software decoder will signal that a frame is ready but then unexpectedly fail to return the frame... stop asserting on that and return an error instead.
| * | | | | | | | | am 49e1ae22: Merge "Sometimes the avc software decoder will signal that a ↵Andreas Huber2010-09-161-4/+11
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | frame is ready but then unexpectedly fail to return the frame... stop asserting on that and return an error instead." into gingerbread Merge commit '49e1ae22801f5f9e620552ffd205b05a0d89f65f' into gingerbread-plus-aosp * commit '49e1ae22801f5f9e620552ffd205b05a0d89f65f': Sometimes the avc software decoder will signal that a frame is ready but then unexpectedly fail to return the frame... stop asserting on that and return an error instead.
| | * | | | | | | | Merge "Sometimes the avc software decoder will signal that a frame is ready ↵Andreas Huber2010-09-161-4/+11
| | |\ \ \ \ \ \ \ \ | | | |_|/ / / / / / | | |/| | | | | | | | | | | | | | | | | but then unexpectedly fail to return the frame... stop asserting on that and return an error instead." into gingerbread
| | | * | | | | | | Sometimes the avc software decoder will signal that a frame is ready but ↵Andreas Huber2010-09-161-4/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | then unexpectedly fail to return the frame... stop asserting on that and return an error instead. Change-Id: I6c0782b51b57e9be0fd410bd34078dc3c2b088d6 related-to-bug: 3005156
* | | | | | | | | | am a85c4f16: am d5d13286: Merge "This was marked @Deprecated in the docs, ↵Joe Onorato2010-09-161-1/+1
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | but it was misspelled." into gingerbread Merge commit 'a85c4f165137ab360879bd9129259690ab6ac05d' * commit 'a85c4f165137ab360879bd9129259690ab6ac05d': This was marked @Deprecated in the docs, but it was misspelled.
| * | | | | | | | | am d5d13286: Merge "This was marked @Deprecated in the docs, but it was ↵Joe Onorato2010-09-161-1/+1
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | misspelled." into gingerbread Merge commit 'd5d1328690b8f274059954e3c1bc9008c4e02dd7' into gingerbread-plus-aosp * commit 'd5d1328690b8f274059954e3c1bc9008c4e02dd7': This was marked @Deprecated in the docs, but it was misspelled.
| | * | | | | | | | Merge "This was marked @Deprecated in the docs, but it was misspelled." into ↵Joe Onorato2010-09-161-1/+1
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gingerbread
| | | * | | | | | | | This was marked @Deprecated in the docs, but it was misspelled.Joe Onorato2010-09-161-1/+1
| | | | |/ / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ic8bd8f53b205da46510ddc7f2ffaec16758a4639
* | | | | | | | | | am 8ee9ecc1: am 9afd9093: Merge "Doc change: clean up droiddoc (cs) macros." ↵Dirk Dougherty2010-09-169-37/+19
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into gingerbread Merge commit '8ee9ecc145c9e05faf13f4bcf5853c888760c1b6' * commit '8ee9ecc145c9e05faf13f4bcf5853c888760c1b6': Doc change: clean up droiddoc (cs) macros.
| * | | | | | | | | am 9afd9093: Merge "Doc change: clean up droiddoc (cs) macros." into gingerbreadDirk Dougherty2010-09-169-37/+19
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '9afd90939b1c2b298592b803c0bfa0b54ff7e453' into gingerbread-plus-aosp * commit '9afd90939b1c2b298592b803c0bfa0b54ff7e453': Doc change: clean up droiddoc (cs) macros.
| | * | | | | | | | Merge "Doc change: clean up droiddoc (cs) macros." into gingerbreadDirk Dougherty2010-09-169-37/+19
| | |\ \ \ \ \ \ \ \ | | | |_|_|/ / / / / | | |/| | | | | | |
| | | * | | | | | | Doc change: clean up droiddoc (cs) macros.Dirk Dougherty2010-09-169-37/+19
| | | | |/ / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | Change-Id: I84b08a573fea42686a41ff694f1a52e8fb760dc5
generated by cgit v1.1 at 2025-11-26 17:01:26 +0000