summaryrefslogtreecommitdiffstats
path: root/include
Commit message (Collapse)AuthorAgeFilesLines
* Add DEPTH image formats, support in ImageReaderEino-Ville Talvala2015-03-091-0/+42
| | | | | | | | | | - Add an explicit mapping between public ImageFormat/ PixelFormat enums and internal HAL format/dataspace. - Add DEPTH16 and DEPTH_POINT_CLOUD formats - Wire up mapping layer to ImageReader to support depth formats Change-Id: I8197eccef900cc91baddcfcb934ccd4d8c972eff
* am 3523e4fc: am efe085ff: Merge "Handle bad ninepatch data." into lmp-mr1-devLeon Scroggins III2015-01-271-3/+3
|\ | | | | | | | | | | | | automerge: 8475144 * commit '847514499f5920d073f5cd402dd0d3bbd19ac2c1': Handle bad ninepatch data.
| * am 3523e4fc: am efe085ff: Merge "Handle bad ninepatch data." into lmp-mr1-devLeon Scroggins III2015-01-271-3/+3
| |\ | | | | | | | | | | | | * commit '3523e4fcb3c74a5dee2f4497e2b8ec7b9e2b5e57': Handle bad ninepatch data.
| | * Handle bad ninepatch data.Leon Scroggins III2015-01-271-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changes proposed by Ben Hawkes of Google Project Zero. NinePatchPeeker.cpp: Instead of asserting, return false for bad data. ResourceTypes.h: Store ninepatch values as unsigned. BUG:19151999 Change-Id: Ibe35e7569f632c6bb8a34a7701e26bb6ed547ec2
* | | am d9bd0886: am aee7225e: Merge "Process base APK" into lmp-mr1-dev ↵Adam Lesinski2015-01-201-1/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | automerge: 554a6f5 * commit 'd9bd08864eaf9d8847d974eadb81806b9e086a2d': Process base APK
| * | am aee7225e: Merge "Process base APK" into lmp-mr1-devAdam Lesinski2015-01-201-1/+1
| |\ \ | | |/ | | | | | | | | | | | | | | | automerge: 554a6f5 * commit '554a6f5278ec05077d8252249afc911897fbfe76': Process base APK
| | * Process base APKAdam Lesinski2015-01-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | The base APK may have resources with configurations that compete against some splits. The base APK must be involved in the selection of splits. Bug:18982001 Change-Id: Ieb29b5a36cf2c68e7831484d98a9fd275acd97e8
* | | Move CanvasJohn Reck2015-01-201-161/+0
| | | | | | | | | | | | Change-Id: I83d557af30fc2d5c69d06eedc0f4d52ac41c4210
* | | am 49138184: am 9568307c: am 43a4a8c7: Fix redundant file backupsChristopher Tate2015-01-151-1/+1
|\ \ \ | |/ / | | | | | | | | | * commit '49138184dee54357b1923f302e4b3fedd73ca34f': Fix redundant file backups
| * | am 9568307c: am 43a4a8c7: Fix redundant file backupsChristopher Tate2015-01-151-1/+1
| |\ \ | | |/ | | | | | | | | | * commit '9568307cf32c8abc6703dc7a1b0b0fee56c4f8f5': Fix redundant file backups
| | * Fix redundant file backupsChristopher Tate2015-01-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We'd observed a bug in which an unchanged file was nevertheless being redundantly transmitted for backup on every backup pass. The underlying issue turns out to have been the FileBackupHelper base implementation's logic for diffing the prior-state file set against the current state, in the case when there had been deletions of prior files. In addition, there was also a parallel bug in which file checksums were not calculated properly in some cases, leading to at least one additional redundant backup of the file in question. Bug 18694053 Change-Id: Ie0dec06486b5fef4624561737019569c85d6b2a0
* | | Make DisplayListRenderer inherit from Canvas, merge JNITom Hudson2015-01-051-3/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Incrementally unify the upper layers for Skia and HWUI. Remove redundant code from GLES20Canvas.java; instead use inherited mNativeCanvasWrapper and superclass method definitions. Moves some unrelated SkPaint utility functions from Renderer to new utils/PaintUtils. bug: 15672762 Change-Id: I4ddd4214b8e9eeb95289d054ef423f2542bb5fa5
* | | Make SkiaCanvas creation call ref() on SkCanvas.Leon Scroggins III2014-12-171-0/+10
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There are two callers of SkiaCanvas::create_canvas(SkCanvas*). In both cases, we were calling ref() first. It is necessary to call ref() in both cases, since we have an SkCanvas returned by SkPictureRecorder::beginRecording, which does not increment the ref count to account for the caller. (i.e. the SkPictureRecorder has the only ref until you call ref()). Rather than leave the ref up to the caller, since the SkiaCanvas does the unref(), it should also do the ref(). Update it to do so and document its behavior. Also, make SkiaCanvas' constructors explicit. Change-Id: I894d0a71a87587cf8c2b26deb2384dc49ae090ef
* | am 740acf21: am c7801877: Merge "Fix issue where non-resource attributes ↵Adam Lesinski2014-12-111-3/+8
|\ \ | |/ | | | | | | | | | | would cause obtainStyleAttributes to fail" into lmp-mr1-dev * commit '740acf213c56c406132294790fa2fadd0380cfa7': Fix issue where non-resource attributes would cause obtainStyleAttributes to fail
| * Fix issue where non-resource attributes would cause obtainStyleAttributes to ↵Adam Lesinski2014-12-101-3/+8
| | | | | | | | | | | | | | | | | | | | | | | | fail A sentinal value of 0x00000000 was used to mark the first time an AttributeFinder was used. If the resource ID of an attribute was also 0x00000000 (which occurs with non-resource attributes, like 'style'), then it would be mistaken as the sentinel start value. Bug:18421787 Change-Id: I4be353e0f8c940cb6f262d155129f048dcc444ae
* | Merge commit '0953ab27' into manualmergeAdam Lesinski2014-12-051-0/+3
|\ \ | |/ | | | | Change-Id: I36dea45f7571096136ea7bda5e2680bd85a0df32
| * AAPT: Move private attrs to new type for frameworkAdam Lesinski2014-12-031-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Private attributes are typically placed after public attributes in the resource table. Each time a new version of the Android framework is released, new public attributes take the place of the private attributes, and the private attributes are shifted after the new public ones. This means that any apps built against the newer SDK may inadvertently be using private attributes on older devices. This change moves all private attributes to a completely different type ID, so there will never be collisions across versions. These private attributes are automatically moved to a synthesized type only for the system resources. Bug:18263655 Change-Id: I7a850512953fadcc9f3524d509cea30249782db8
* | am 503071ae: am a2b5067a: Merge "RRO: prevent duplicate system overlays"Adam Lesinski2014-12-041-0/+2
|\ \ | | | | | | | | | | | | * commit '503071ae41374a66f61e53e05a91243473db83b9': RRO: prevent duplicate system overlays
| * \ Merge "RRO: prevent duplicate system overlays"Adam Lesinski2014-12-031-0/+2
| |\ \
| | * | RRO: prevent duplicate system overlaysMårten Kongstad2014-11-071-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | System overlays, ie overlays with targetPackage="android", were loaded twice, which caused all sorts of issues. Ensure they are only loaded once, which will be during Zygote initialization. Bug: 17765434 Change-Id: Ia5064045c77f713c58fb78adc3942f6af1abdc93
* | | | Merge commit '06d8b7b8' into manualmergeAdam Lesinski2014-11-171-0/+201
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | Conflicts: core/jni/android_util_AssetManager.cpp Change-Id: I77b72d0d3ec8184ccd97419e4c76b7d55b1a52ca
| * | | Implement back-tracking when searching for attributes in XML or resource bagAdam Lesinski2014-11-041-0/+201
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Shared libraries have their package ID assigned at run-time, so some of the guarantees we used to have about sort order of attributes in bags or XML elements no longer hold. This CL adds back-tracking and can jump to the nearest attribute with the same package ID and continue searching. This means that attributes with the same package ID must be sorted by increasing resource ID, as was the case before. Attributes with the same package ID must be grouped together, but the groups can be in any order. Ex: 0x02010001, 0x02010002, 0x01010000, 0x01010010, 0x7f010032 Bug:17666947 Change-Id: I9c198bbb6ca788849aac85b6323606ea5d9550d6
* | | | am f89a2fda: Merge "Frameworks/base: Fix two warnings in cmds"Andreas Gampe2014-11-081-3/+1
|\ \ \ \ | | |/ / | |/| | | | | | | | | | * commit 'f89a2fdacb2ba907f180188dc79f9de81e3eb254': Frameworks/base: Fix two warnings in cmds
| * | | Frameworks/base: Fix two warnings in cmdsAndreas Gampe2014-11-081-3/+1
| | | | | | | | | | | | Change-Id: Ifb9c7fb7a2d28c13010ddc186bea5f5f0daefb4a
* | | | resolved conflicts for merge of 487ae9b8 to lmp-mr1-dev-plus-aospAndreas Gampe2014-11-071-2/+2
|\ \ \ \ | |/ / / | | / / | |/ / |/| | Change-Id: I395f184d885a7ef30aa113ab01fcaacc94243008
| * | Frameworks/base: Wall Werror in libs/androidfwAndreas Gampe2014-11-071-2/+2
| |/ | | | | | | | | | | | | Turn on -Wall -Werror in libs/androidfw. Fix warnings. Refactor some code. Change-Id: I66fe54ace433c15dee5de328b149ca142f74b2dd
| * am 8bdb265f: am 19f9d54f: Merge "Fix backwards compat problem with AAPT ↵Adam Lesinski2014-09-191-0/+2
| |\ | | | | | | | | | | | | | | | | | | public attrs" into lmp-dev * commit '8bdb265f0a73bc6f2114ca70f141c214a23696c7': Fix backwards compat problem with AAPT public attrs
| * \ am d3d6ecdb: am 52e5e359: Merge "USB string descriptors are not UTF8, so it ↵Mike Lockwood2014-09-191-0/+3
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | is not safe to treat them as such." into lmp-dev * commit 'd3d6ecdb7a6b00347920c5e706275017854849af': USB string descriptors are not UTF8, so it is not safe to treat them as such.
| * \ \ am a38e59b1: am 683872af: Merge "Clean entire arg block when setting process ↵Jeff Brown2014-09-121-3/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | name." into lmp-dev * commit 'a38e59b1b4164a33c38fc522e56601d886c49833': Clean entire arg block when setting process name.
| * \ \ \ resolved conflicts for merge of 6c585756 to lmp-dev-plus-aospDan Albert2014-09-081-10/+10
| |\ \ \ \ | | | | | | | | | | | | | | | | | | Change-Id: I5a25f2bac44ac5efcd7462af91005e09680a1d96
| | * \ \ \ Merge "Use char16_t for char things."Dan Albert2014-09-091-10/+10
| | |\ \ \ \
| | | * | | | Use char16_t for char things.Dan Albert2014-09-081-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When compiling in C++ mode, the compiler will complain about conversions from uint16_t to char16_t. Be consistent in using char16_t for strings. Change-Id: I052b6176ced635162920b31560052d9a64f92764
| | * | | | | Disable compilation based on vold.decrypt. [frameworks/base]Brian Carlstrom2014-07-311-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 15165413 Change-Id: I1972c5af5f392c2ed247888ef33c03e9ffe4d588
| | * | | | | Move from dalvik.vm.image-dex2oat-flags to dalvik.vm.dex2oat-filter ↵Brian Carlstrom2014-07-311-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [frameworks/base] This will allow us to conditionally change the compiler-filter based on other properties. Bug: 15165413 Change-Id: I1676987c69a3cad4217dc4b56465ef3ae886122a
* | | | | | | Merge "Fix issues that will be present in C++11" into lmp-mr1-devAdam Lesinski2014-11-031-12/+23
|\ \ \ \ \ \ \
| * | | | | | | Fix issues that will be present in C++11Adam Lesinski2014-11-031-12/+23
| | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - char16_t is a distinct type, so stay consistent with it throughout the code base. - char16_t is defined as minimum size of 16 bits. Since we mmap and cast data structures onto raw memory, we need a precise definition (uint16_t), so we cast between that (and static_assert that they are the same size). Change-Id: I869c32637543bbcfb39d2643e7d9df10d33acd3c
* | | | | | | Distinguish unspecified and explicit null values in resourcesAlan Viverette2014-10-291-1/+10
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | BUG: 17919345 Change-Id: Ic4f04f7dd0f986f58a749b5950d80c1cfdb074ea
* | | | | | Merge "Fix backwards compat problem with AAPT public attrs" into lmp-devAdam Lesinski2014-09-191-0/+2
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Fix backwards compat problem with AAPT public attrsAdam Lesinski2014-09-181-0/+2
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AAPT has traditionally assigned resource IDs to public attributes, and then followed those public definitions with private attributes. --- PUBLIC --- | 0x01010234 | attr/color | 0x01010235 | attr/background --- PRIVATE --- | 0x01010236 | attr/secret | 0x01010237 | attr/shhh Each release, when attributes are added, they take the place of the private attributes and the private attributes are shifted down again. --- PUBLIC --- | 0x01010234 | attr/color | 0x01010235 | attr/background | 0x01010236 | attr/shinyNewAttr | 0x01010237 | attr/highlyValuedFeature --- PRIVATE --- | 0x01010238 | attr/secret | 0x01010239 | attr/shhh Platform code may look for private attributes set in a theme. If an app compiled against a newer version of the platform uses a new public attribute that happens to have the same ID as the private attribute the older platform is expecting, then the behavior is undefined. We get around this by detecting any newly defined attributes (in L), copy the resource into a -v21 qualified resource, and delete the attribute from the original resource. This ensures that older platforms don't see the new attribute, but when running on L+ platforms, the attribute will be respected. We still need to address this problem in the platform moving forward, as this will only help us in the transition from pre L to L. Bug:17520380 Change-Id: Ia2a985798b50006c21c7c3431d30d9598f27cd91
* | | | | Merge "USB string descriptors are not UTF8, so it is not safe to treat them ↵Mike Lockwood2014-09-191-0/+3
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | as such." into lmp-dev
| * | | | USB string descriptors are not UTF8, so it is not safe to treat them as such.Mike Lockwood2014-09-081-0/+3
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | Add AndroidRuntime::NewStringLatin1() to convert non-UTF8 strings to Java strings. Bug: 17427781 Change-Id: I7df1d4e94a7beebc8b1a74c0c0a163b794025ae8
* | | | Clean entire arg block when setting process name.Jeff Brown2014-09-111-3/+1
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When Android processes fork from Zygote, we rewrite the command line with a new name, eg. "system_server". When we do this, we should fill the entire block with zeros to remove corrupted argument information that may otherwise remain in the /proc/<pid>/cmdline buffer and be seen in tools and stack dumps. Fixed an issue where VM options could be overwritten after setting the nice name if the name was too long. Bug: 17474152 Change-Id: Ie6cf9ed7752a04300a340e26cd6812bb35c59e1b
* | | Stamp platform version code into app ApksAdam Lesinski2014-08-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The versionCode of theframework resources that an app is built against gets stamped inside an app's AndroidManifest.xml in the <manifest> tag as "platformBuildVersionCode" and "platformBuildVersionName" attributes. Bug:17207635 Change-Id: Id573c3dffcbca38eec9c0eb3e89f4a547e3361d3
* | | Introduce anydpi density resource qualifierAdam Lesinski2014-08-251-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is meant to be used with scaleable vector drawables, and are chosen as the best match unless there is a configuration that matches the density requested exactly. Bug:17007265 Change-Id: Ic3288d0236fe0bff20bb1599aba2582c25b0db32
* | | AAPT: Fix regression generating dynamic ref table for shared librariesAdam Lesinski2014-08-201-0/+3
| | | | | | | | | | | | | | | | | | AAPT stopped generating dynamic reference tables for shared libraries. Change-Id: Ib0025811bdca1a4756eb21080dd6b6bb3fc1ca3d
* | | Merge "AAPT support for feature splits" into lmp-devAdam Lesinski2014-08-091-0/+2
|\ \ \
| * | | AAPT support for feature splitsAdam Lesinski2014-08-041-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change allows the developer to add a base package for which to build a feature split. The generated resource types will begin after the base APK's defined types so as not to collide or override resources. Multiple features can be generated by first choosing an arbitrary order for the features. Then for each feature, the base APK and any preceding features are specified with the --feature-of flags. So with a base APK 'A' and features, 'B', and 'C', 'B' would be built with aapt package [...] --feature-of A [...] and 'C' would be built with aapt package [...] --feature-of A --feature-of B [...] Change-Id: I1be66e3f8df9a737b21c71f8a93685376c7e6780
* | | | Disable compilation based on vold.decrypt. [frameworks/base]Brian Carlstrom2014-08-061-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 15165413 (cherry picked from commit 4fd561637a173c7fa6a1d71e9115db1db90514ff) Change-Id: I2a13b63f9d4a7ffd69a8d21666c6dce84739c6ed
* | | | Move from dalvik.vm.image-dex2oat-flags to dalvik.vm.dex2oat-filter ↵Brian Carlstrom2014-08-061-0/+4
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [frameworks/base] This will allow us to conditionally change the compiler-filter based on other properties. Bug: 15165413 (cherry picked from commit f60d3a4702f6d00d7edb5d348c53b9b03ae16b76) Change-Id: I293c81ba817e9abbf9c05b3fb554ef2f0ad0c4ed
* | | Merge "Add kModeSync" into lmp-devBo Liu2014-07-241-1/+6
|\ \ \
generated by cgit v1.1 at 2025-01-07 05:51:40 +0000