summaryrefslogtreecommitdiffstats
path: root/core/jni
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Intern strings used in Sensor information."destradaa2015-02-121-9/+53
|\
| * Intern strings used in Sensor information.destradaa2015-02-101-9/+53
| | | | | | | | | | | | | | | | By creating a local 'interning map', Sensor information, such as: name, vendor, stringType, and requirePermissions; 92 string objects are not needed anymore. This frees ~6KB of memory in all processes accessing SensorManager. Change-Id: Idfdc98160363bec844c34fc3b71f5e8d7843a7be
* | am f5d30463: am 4fa3a80b: am a5f301c7: Merge "Legacy: Only set user surface ↵Eino-Ville Talvala2015-02-121-9/+3
|\ \ | |/ |/| | | | | | | | | | | | | dimensions on output surfaces" into lmp-mr1-dev automerge: ad5591f * commit 'ad5591f819466fc1c87d9ca76be8c06673ccce34': Legacy: Only set user surface dimensions on output surfaces
| * am f5d30463: am 4fa3a80b: am a5f301c7: Merge "Legacy: Only set user surface ↵Eino-Ville Talvala2015-02-121-9/+3
| |\ | | | | | | | | | | | | | | | | | | dimensions on output surfaces" into lmp-mr1-dev * commit 'f5d304636d27ea300c092fac0f0214170a89ba39': Legacy: Only set user surface dimensions on output surfaces
| | * Legacy: Only set user surface dimensions on output surfacesEino-Ville Talvala2015-02-111-9/+3
| | | | | | | | | | | | | | | | | | | | | | | | The GL layer gets exclusive use of the direct producer dimensions; we should only set the user dimensions. Bug: 16404608 Change-Id: Ie5b720104bdbee6b096b62520baa1c6b518c6c1c
| | * Check that bitmap's size does not exceed 32 bits. DO NOT MERGELeon Scroggins III2015-02-101-1/+6
| | | | | | | | | | | | | | | BUG:19270126 Change-Id: I075d1cefcd3208305a72b4fa629a262e92eb60ea
* | | Add additional info to AudioPort for enum/selection API.Paul McLean2015-02-041-10/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add "device name" member to AudioPort. Moved unique device ID from DevicePort to AudioPort. Straighten out confusion between "name" and "address" Created string constants for Intent "extra" data keys. Combine card/address data into "address" at sender.Add additional info to AudioPort for enum/selection API. Parse out USB Device name in UsbCardsParser. Change-Id: Ifd76b0298312090a8f39e638339f993b86d47080
* | | Merge "Rename Canvas::getSkCanvas to Canvas::asSkCanvas"Derek Sollenberger2015-01-304-5/+5
|\ \ \
| * | | Rename Canvas::getSkCanvas to Canvas::asSkCanvasDerek Sollenberger2015-01-294-5/+5
| | | | | | | | | | | | | | | | Change-Id: I967a45698d382e54eaa5ff64fa8909ff00908650
* | | | Merge "AvoidXferMode -> AvoidXfermode."Leon Scroggins III2015-01-304-22/+22
|\ \ \ \
| * | | | AvoidXferMode -> AvoidXfermode.Leon Scroggins III2015-01-304-22/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When I moved this code here from external/skia, I accidentally changed the lowercase 'm' to uppercase 'M'. Change back, to keep consistent with SkXfermode and Xfermode.cpp. Change-Id: I9694d29a22aaed7fcc8708f5962e3d2032297d08
* | | | | Merge "Move SkAvoidXferMode into frameworks/base."Leon Scroggins III2015-01-304-3/+251
|\ \ \ \ \ | |/ / / /
| * | | | Move SkAvoidXferMode into frameworks/base.Leon Scroggins III2015-01-304-3/+251
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We are removing it from Skia, so we need it here to support Android. Add some small cleanups (remove comment that doesn't apply, convert SK_OVERRIDE to override, remove 'virtual' keyword from methods with 'override' on them). BUG:skbug.com/3329 Change-Id: I1f883082d6fb9d49b9c9ba9e1f50bd713eabf915
* | | | Merge "Fix bitmap allocation error that causes crash when calling ↵Derek Sollenberger2015-01-291-15/+20
|\ \ \ \ | | | | | | | | | | | | | | | Bitmap::extractAlpha"
| * | | | Fix bitmap allocation error that causes crash when calling Bitmap::extractAlphaDerek Sollenberger2015-01-291-15/+20
| |/ / / | | | | | | | | | | | | | | | | bug: 19112656 Change-Id: Ib44ba4208449d5873402e9516abc8b6d8fa0b82a
* | | | am 3523e4fc: am efe085ff: Merge "Handle bad ninepatch data." into lmp-mr1-devLeon Scroggins III2015-01-271-1/+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-1/+3
| |\ \ | | |/ | | | | | | | | | * commit '3523e4fcb3c74a5dee2f4497e2b8ec7b9e2b5e57': Handle bad ninepatch data.
| | * Handle bad ninepatch data.Leon Scroggins III2015-01-271-1/+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
* | | Merge "Add support for persist.sys.locale." automerge: dca2332 automerge: ↵Narayan Kamath2015-01-221-20/+32
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | 117f161 automerge: 1194e75 * commit '1194e754a95e1fa5d4eba6d0bca109156dd4df94': Add support for persist.sys.locale.
| * | Merge "Add support for persist.sys.locale." automerge: dca2332Narayan Kamath2015-01-221-20/+32
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | automerge: 117f161 * commit '117f161fee52dfa200f89282c487d58c29b41d4f': Add support for persist.sys.locale.
| | * | Add support for persist.sys.locale.Narayan Kamath2015-01-221-20/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AndroidRuntime has been changed to read "ro.product.locale" and "persist.sys.locale" instead of "ro.product.locale.language" etc. This is passed down as "-Duser.locale" to the runtime. The system_server has been changed to write out persist.sys.locale on locale changes. bug: 17691569 Change-Id: I93360c8795c9620a133656dc491d13d7b6ed162e
* | | | Remove DisplayListLogBufferChris Craik2015-01-211-1/+1
| | | | | | | | | | | | | | | | Change-Id: I001832fc444b6d532f4a382e0a31cc1d8956dbd8
* | | | Move CanvasJohn Reck2015-01-204-744/+1
| | | | | | | | | | | | | | | | Change-Id: I83d557af30fc2d5c69d06eedc0f4d52ac41c4210
* | | | Merge "Allow AUDIO_FORMAT_PCM_8_BIT static AudioTrack buffers"Andy Hung2015-01-161-45/+5
|\ \ \ \
| * | | | Allow AUDIO_FORMAT_PCM_8_BIT static AudioTrack buffersAndy Hung2015-01-131-45/+5
| | | | | | | | | | | | | | | | | | | | Change-Id: I7424455ccff860126ceda432613db67a8933ea1e
* | | | | am 04b633c5: am 0de2eca5: am 112e35b4: Merge "Update generationId on bitmaps ↵Chris Craik2015-01-161-0/+1
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | when decoded into by BitmapRegionDecoder" into lmp-mr1-dev * commit '04b633c526b3ea72cb13f0c0472673f3baf07625': Update generationId on bitmaps when decoded into by BitmapRegionDecoder
| * | | | am 0de2eca5: am 112e35b4: Merge "Update generationId on bitmaps when decoded ↵Chris Craik2015-01-151-0/+1
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | into by BitmapRegionDecoder" into lmp-mr1-dev * commit '0de2eca5fc439e2622cc0cc5a54cd9a5938f67c6': Update generationId on bitmaps when decoded into by BitmapRegionDecoder
| | * | | Merge "Update generationId on bitmaps when decoded into by ↵Chris Craik2015-01-151-0/+1
| | |\ \ \ | | | | | | | | | | | | | | | | | | BitmapRegionDecoder" into lmp-mr1-dev
| | | * | | Update generationId on bitmaps when decoded into by BitmapRegionDecoderChris Craik2015-01-141-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:18921087 This fixes issues where bitmaps are cached as textures, and not reuploaded when reused by BitmapRegionDecoder, showing stale content. Change-Id: I7626fd6acd36d8e38723689734855ce9154eb8c8
* | | | | | am 31028fa6: am 1334a6f3: am 8d47bc97: Merge "Camera: Clarify JNI exception ↵Eino-Ville Talvala2015-01-161-1/+2
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | message" into lmp-mr1-dev * commit '31028fa621b0f182f39b1f6d391963e8e6f627fe': Camera: Clarify JNI exception message
| * | | | | am 1334a6f3: am 8d47bc97: Merge "Camera: Clarify JNI exception message" into ↵Eino-Ville Talvala2015-01-151-1/+2
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-mr1-dev * commit '1334a6f34296094baddc0d4c0c93357532b2a96d': Camera: Clarify JNI exception message
| | * | | | Camera: Clarify JNI exception messageEino-Ville Talvala2015-01-121-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This exception may be generated through MediaRecorder method calls as well, so clarify that the issue is an invalid camera object. Bug: 18414095 Change-Id: I189ab1a71ab0d6a432b87c45a82c90fe11d22ef8
* | | | | | Remove last mention of SkFontHost.Ben Wagner2015-01-152-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SkFontHost is now almost removed from Skia, and nothing is left in it which interests Android. Remove the last few references to it to aid in final removal. Change-Id: I7d59cf7e08bdd5b9c3923c9ffaf03b1cc2f9f7b4
* | | | | | Merge "Update HWUI to store its own SkBitmap objects"Derek Sollenberger2015-01-144-16/+88
|\ \ \ \ \ \
| * | | | | | Update HWUI to store its own SkBitmap objectsDerek Sollenberger2015-01-094-16/+88
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This enables us to... 1) simplify the lifecycle/ownership between Java and HWUI 2) remove DisplayListRenderer::drawBitmapData and associated logic 3) track pixel lifecycle using standard SkPixelRef refcounting 4) Remove uncessary calls to ref/unref the bitmap's pixels and colorTable Change-Id: I3c95078da20995444f6388a029414280fd654318
* | | | | | | Remove dead code from AssetStreamAdapter.Ben Wagner2015-01-124-37/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After "Use at least SkStreamAsset for SkTypefaces." there is now dead code in AssetStreamAdapter. Remove the code and update the users. Change-Id: I17a9d82dd6ca4d87a951c1570dc91de7f2fc54f2
* | | | | | | Use at least SkStreamAsset for SkTypefaces.Ben Wagner2015-01-121-5/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The existing AssetStreamAdapter is only SkStreamRewindable, and does not support 'duplicate'. This is needed in order for SkTypeface to be used properly. Also, SkTypeface is moving to require SkStreamAsset for creating typefaces for performance and code reasons. In the previous code, Asset::getBuffer is called on creation of the typeface, so do so explicitly and manage the memory directly. This also prevents additional copies being made of the asset data. BUG: 18867034 Change-Id: I458a8ec024efefb761138178b87b88b48cb4a773
* | | | | | | am 8f8dc488: resolve merge conflicts of 0f647c1 to lmp-mr1-dev-plus-aosp.Ruben Brunk2015-01-101-4/+20
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | * commit '8f8dc4882bc61b7e273ac991e2ae99834d55b7d0': Camera2: Fix early EOF in DngCreator#writeByteBuffer.
| * | | | | | resolve merge conflicts of 0f647c1 to lmp-mr1-dev-plus-aosp.Ruben Brunk2015-01-091-4/+20
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | | | | | | | Change-Id: Idbf96ab23c02dc7c380d6c3a4a87b1f380446c61
| | * | | | | Merge "Camera2: Fix early EOF in DngCreator#writeByteBuffer." into lmp-mr1-devRuben Brunk2015-01-091-4/+10
| | |\ \ \ \ \
| | | * | | | | Camera2: Fix early EOF in DngCreator#writeByteBuffer.Ruben Brunk2015-01-091-4/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 18962278 Change-Id: I8641a03d866930c86bdd2db0a29ccd5560712c90
| | * | | | | | Check for OOM in BitmapFactory's getMimeTypeString().Vladimir Marko2015-01-071-4/+9
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 18909596 (cherry picked from commit 7ab249a18e08bfefb8c2d60af1fb668c67ba4368) Change-Id: Ie7be228442876d47faf37e3f664e378253dab6e3
* | | | | | | Use the generic Canvas instead of SkCanvasDerek Sollenberger2015-01-091-6/+10
| |_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | bug: 18642206 Change-Id: I0dc3f6b620083e5948c2d4be541ae7c6261b3482
* | | | | | am ec64c0b6: am 022b1ba1: Merge "Core/jni: Disallow relocation for decryption"Andreas Gampe2015-01-071-0/+8
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | automerge: 555ea65 * commit '555ea653bae019379eb8d1aa70dfcb86789c19d3': Core/jni: Disallow relocation for decryption
| * | | | | am ec64c0b6: am 022b1ba1: Merge "Core/jni: Disallow relocation for decryption"Andreas Gampe2015-01-071-0/+8
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | | | | | | | | | | | | * commit 'ec64c0b6e639b743398fb543218100fdaf9a7f69': Core/jni: Disallow relocation for decryption
| | * | | | Merge "Core/jni: Disallow relocation for decryption"Andreas Gampe2015-01-071-0/+8
| | |\ \ \ \
| | | * | | | Core/jni: Disallow relocation for decryptionneo.chae2015-01-071-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When decrypting a device, a tmpfs is temporarily mounted as /data, the size of which is usually small. When the zygote, system server and necessary apps are brought up, they will be compiled into the tmpfs. If the system image contains prebuilts, they will be relocated instead of compiled. This is unnecessary. In this special situation it is acceptable to run out of the prebuilt oat files without relocation, which can save space in the tmpfs. This patch ensures that the boot image is not being relocated. Change-Id: I42bfb7e3039574b7e4f2772e0d395f093d59ed1b Signed-off-by: Hyangseok Chae <neo.chae@lge.com>
* | | | | | | Merge "Merge frameworks/base changes from master-skia to master."Tom Hudson2015-01-078-35/+53
|\ \ \ \ \ \ \
| * | | | | | | Merge frameworks/base changes from master-skia to master.Mike Reed2015-01-068-35/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adaptations to changes in Skia upstream since Oct 2014. (https://code.google.com/p/skia/issues/detail?id=2377) cbb922d use new roundOut signature 77082de Call SkColorTable::readColors(). 5456ab1 Handle the result of SkMatrix::asAffine. 25cfc78 Remove dependence on SK_LEGACY_PICTURE_SIZE_API. BUG:18468293 Change-Id: I5a4d274e854298843891410b1ffd5e24f038b88a
* | | | | | | | am bf31cb6b: am 8371f2e3: Merge "Check for OOM in BitmapFactory\'s ↵Vladimir Marko2015-01-071-5/+10
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | getMimeTypeString()." automerge: 4e29869 * commit '4e2986940b2ff456693a805026c6910e950c42e2': Check for OOM in BitmapFactory's getMimeTypeString().
generated by cgit v1.1 at 2025-02-09 13:02:00 +0000