summaryrefslogtreecommitdiffstats
path: root/core/jni
Commit message (Expand)AuthorAgeFilesLines
* Merge "Intern strings used in Sensor information."destradaa2015-02-121-9/+53
|\
| * Intern strings used in Sensor information.destradaa2015-02-101-9/+53
* | am f5d30463: am 4fa3a80b: am a5f301c7: Merge "Legacy: Only set user surface d...Eino-Ville Talvala2015-02-121-9/+3
|\ \ | |/ |/|
| * am f5d30463: am 4fa3a80b: am a5f301c7: Merge "Legacy: Only set user surface d...Eino-Ville Talvala2015-02-121-9/+3
| |\
| | * Legacy: Only set user surface dimensions on output surfacesEino-Ville Talvala2015-02-111-9/+3
| | * Check that bitmap's size does not exceed 32 bits. DO NOT MERGELeon Scroggins III2015-02-101-1/+6
* | | Add additional info to AudioPort for enum/selection API.Paul McLean2015-02-041-10/+20
* | | Merge "Rename Canvas::getSkCanvas to Canvas::asSkCanvas"Derek Sollenberger2015-01-304-5/+5
|\ \ \
| * | | Rename Canvas::getSkCanvas to Canvas::asSkCanvasDerek Sollenberger2015-01-294-5/+5
* | | | Merge "AvoidXferMode -> AvoidXfermode."Leon Scroggins III2015-01-304-22/+22
|\ \ \ \
| * | | | AvoidXferMode -> AvoidXfermode.Leon Scroggins III2015-01-304-22/+22
* | | | | 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
| |/ / /
* | | | Merge "Fix bitmap allocation error that causes crash when calling Bitmap::ext...Derek Sollenberger2015-01-291-15/+20
|\ \ \ \
| * | | | Fix bitmap allocation error that causes crash when calling Bitmap::extractAlphaDerek Sollenberger2015-01-291-15/+20
| |/ / /
* | | | am 3523e4fc: am efe085ff: Merge "Handle bad ninepatch data." into lmp-mr1-devLeon Scroggins III2015-01-271-1/+3
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | am 3523e4fc: am efe085ff: Merge "Handle bad ninepatch data." into lmp-mr1-devLeon Scroggins III2015-01-271-1/+3
| |\ \ | | |/
| | * Handle bad ninepatch data.Leon Scroggins III2015-01-271-1/+3
* | | Merge "Add support for persist.sys.locale." automerge: dca2332 automerge: 117...Narayan Kamath2015-01-221-20/+32
|\ \ \ | |/ /
| * | Merge "Add support for persist.sys.locale." automerge: dca2332Narayan Kamath2015-01-221-20/+32
| |\ \
| | * | Add support for persist.sys.locale.Narayan Kamath2015-01-221-20/+32
* | | | Remove DisplayListLogBufferChris Craik2015-01-211-1/+1
* | | | Move CanvasJohn Reck2015-01-204-744/+1
* | | | 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
* | | | | am 04b633c5: am 0de2eca5: am 112e35b4: Merge "Update generationId on bitmaps ...Chris Craik2015-01-161-0/+1
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | am 0de2eca5: am 112e35b4: Merge "Update generationId on bitmaps when decoded ...Chris Craik2015-01-151-0/+1
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | Merge "Update generationId on bitmaps when decoded into by BitmapRegionDecode...Chris Craik2015-01-151-0/+1
| | |\ \ \
| | | * | | Update generationId on bitmaps when decoded into by BitmapRegionDecoderChris Craik2015-01-141-0/+1
* | | | | | am 31028fa6: am 1334a6f3: am 8d47bc97: Merge "Camera: Clarify JNI exception m...Eino-Ville Talvala2015-01-161-1/+2
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 1334a6f3: am 8d47bc97: Merge "Camera: Clarify JNI exception message" into ...Eino-Ville Talvala2015-01-151-1/+2
| |\ \ \ \ \ | | |/ / / /
| | * | | | Camera: Clarify JNI exception messageEino-Ville Talvala2015-01-121-1/+2
* | | | | | Remove last mention of SkFontHost.Ben Wagner2015-01-152-3/+3
* | | | | | 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
* | | | | | | Remove dead code from AssetStreamAdapter.Ben Wagner2015-01-124-37/+5
* | | | | | | Use at least SkStreamAsset for SkTypefaces.Ben Wagner2015-01-121-5/+14
* | | | | | | am 8f8dc488: resolve merge conflicts of 0f647c1 to lmp-mr1-dev-plus-aosp.Ruben Brunk2015-01-101-4/+20
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | resolve merge conflicts of 0f647c1 to lmp-mr1-dev-plus-aosp.Ruben Brunk2015-01-091-4/+20
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| | * | | | | 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
| | * | | | | | Check for OOM in BitmapFactory's getMimeTypeString().Vladimir Marko2015-01-071-4/+9
| | |/ / / / /
* | | | | | | Use the generic Canvas instead of SkCanvasDerek Sollenberger2015-01-091-6/+10
| |_|/ / / / |/| | | | |
* | | | | | am ec64c0b6: am 022b1ba1: Merge "Core/jni: Disallow relocation for decryption"Andreas Gampe2015-01-071-0/+8
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am ec64c0b6: am 022b1ba1: Merge "Core/jni: Disallow relocation for decryption"Andreas Gampe2015-01-071-0/+8
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| | * | | | Merge "Core/jni: Disallow relocation for decryption"Andreas Gampe2015-01-071-0/+8
| | |\ \ \ \
| | | * | | | Core/jni: Disallow relocation for decryptionneo.chae2015-01-071-0/+8
* | | | | | | 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
* | | | | | | | am bf31cb6b: am 8371f2e3: Merge "Check for OOM in BitmapFactory\'s getMimeTyp...Vladimir Marko2015-01-071-5/+10
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |