4514 Commits

Author SHA1 Message Date
Dan Albert
fc6cd75fc0 am 72e7217d: am b7121d70: am b78cce6f: Merge "Update autogenerated gl functions."
* commit '72e7217d0bd1035fc0c947da5d1e802624774a80':
  Update autogenerated gl functions.
2015-02-25 23:17:44 +00:00
Dan Albert
b7121d7030 am b78cce6f: Merge "Update autogenerated gl functions."
* commit 'b78cce6f92e38b57a6a56183cdbafc054c5758fe':
  Update autogenerated gl functions.
2015-02-25 23:00:52 +00:00
Dan Albert
b78cce6f92 Merge "Update autogenerated gl functions." 2015-02-25 22:50:25 +00:00
Mark Salyzyn
a49ce66b06 am f7b68049: am 533758c1: am 0d8b97a4: Merge "jni: switch to ANDROID_LOG_* mode flags"
* commit 'f7b68049521b5f1c31894f5dad529f719098e987':
  jni: switch to ANDROID_LOG_* mode flags
2015-02-25 19:26:57 +00:00
Mark Salyzyn
533758c1fb am 0d8b97a4: Merge "jni: switch to ANDROID_LOG_* mode flags"
* commit '0d8b97a44e4cb5c5cfffd6421eb2cec1ebc00d2f':
  jni: switch to ANDROID_LOG_* mode flags
2015-02-25 19:13:12 +00:00
Mark Salyzyn
18998c9852 jni: switch to ANDROID_LOG_* mode flags
Change-Id: I8aea5bf4faf79a96fa8485f7707e7484cd11d7a3
2015-02-25 18:07:21 +00:00
Dan Albert
10caf0390d Update autogenerated gl functions.
Corresponding frameworks/native change:
https://android-review.googlesource.com/#/c/134491/

Since this fixes the int-to-pointer cast issues, stop ignoring that
warning.

Change-Id: I85134dc151ba368e4619e36125264b2b3f104202
2015-02-23 10:47:19 -08:00
Chris Craik
e1a0858fb0 Merge "Glop layer mesh rendering" 2015-02-20 19:30:40 +00:00
John Reck
ba6adf66d3 Initial attempt at jank-tracking stat collection
Is a bit naive, perhaps overly aggressive, but sorta works

Change-Id: I01a774e00dbe681439c02557d9728ae43c45ce50
2015-02-20 08:27:38 -08:00
Chris Craik
f27133df2d Glop layer mesh rendering
Change-Id: I2d902819d5d77f496b67d4d25a298782903e410d
2015-02-19 18:06:05 -08:00
Sasha Levitskiy
c31dd3bdff Fingerprint: Adjust to HAL2 spec.
Change-Id: Ifc0497079aa059710b3fd4e3b1ad521acf5dcd3c
2015-02-13 15:47:43 -08:00
destradaa
1ea5736339 Merge "Intern strings used in Sensor information." 2015-02-12 20:30:07 +00:00
Eino-Ville Talvala
346066ef90 am f5d30463: am 4fa3a80b: am a5f301c7: Merge "Legacy: Only set user surface dimensions on output surfaces" into lmp-mr1-dev
automerge: ad5591f

* commit 'ad5591f819466fc1c87d9ca76be8c06673ccce34':
  Legacy: Only set user surface dimensions on output surfaces
2015-02-12 07:52:49 +00:00
Eino-Ville Talvala
ad5591f819 am f5d30463: am 4fa3a80b: am a5f301c7: Merge "Legacy: Only set user surface dimensions on output surfaces" into lmp-mr1-dev
* commit 'f5d304636d27ea300c092fac0f0214170a89ba39':
  Legacy: Only set user surface dimensions on output surfaces
2015-02-12 05:54:34 +00:00
Eino-Ville Talvala
b0acf7fcfa Legacy: Only set user surface dimensions on output surfaces
The GL layer gets exclusive use of the direct producer dimensions;
we should only set the user dimensions.

Bug: 16404608
Change-Id: Ie5b720104bdbee6b096b62520baa1c6b518c6c1c
2015-02-11 16:58:10 -08:00
destradaa
9ba7c1c175 Intern strings used in Sensor information.
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
2015-02-10 15:07:50 -08:00
Leon Scroggins III
89a2466a2a Check that bitmap's size does not exceed 32 bits. DO NOT MERGE
BUG:19270126
Change-Id: I075d1cefcd3208305a72b4fa629a262e92eb60ea
2015-02-10 20:57:45 +00:00
Paul McLean
10804eb281 Add additional info to AudioPort for enum/selection API.
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
2015-02-04 14:37:19 -08:00
Derek Sollenberger
c4e4eef64a Merge "Rename Canvas::getSkCanvas to Canvas::asSkCanvas" 2015-01-30 14:25:24 +00:00
Leon Scroggins III
9a1eefe174 Merge "AvoidXferMode -> AvoidXfermode." 2015-01-30 14:12:27 +00:00
Leon Scroggins III
ed1ce37759 AvoidXferMode -> AvoidXfermode.
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
2015-01-30 09:05:11 -05:00
Leon Scroggins III
9bf106f156 Merge "Move SkAvoidXferMode into frameworks/base." 2015-01-30 13:55:23 +00:00
Leon Scroggins III
626647c3f6 Move SkAvoidXferMode into frameworks/base.
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
2015-01-30 08:32:49 -05:00
Derek Sollenberger
c5ea9faef0 Merge "Fix bitmap allocation error that causes crash when calling Bitmap::extractAlpha" 2015-01-29 17:44:01 +00:00
Derek Sollenberger
d37095b74e Fix bitmap allocation error that causes crash when calling Bitmap::extractAlpha
bug: 19112656
Change-Id: Ib44ba4208449d5873402e9516abc8b6d8fa0b82a
2015-01-29 11:52:45 -05:00
Derek Sollenberger
b3d50e0075 Rename Canvas::getSkCanvas to Canvas::asSkCanvas
Change-Id: I967a45698d382e54eaa5ff64fa8909ff00908650
2015-01-29 11:25:55 -05:00
Leon Scroggins III
283ddb9d4f am 3523e4fc: am efe085ff: Merge "Handle bad ninepatch data." into lmp-mr1-dev
automerge: 8475144

* commit '847514499f5920d073f5cd402dd0d3bbd19ac2c1':
  Handle bad ninepatch data.
2015-01-27 23:34:35 +00:00
Leon Scroggins III
847514499f am 3523e4fc: am efe085ff: Merge "Handle bad ninepatch data." into lmp-mr1-dev
* commit '3523e4fcb3c74a5dee2f4497e2b8ec7b9e2b5e57':
  Handle bad ninepatch data.
2015-01-27 18:33:46 +00:00
Leon Scroggins III
a730ef3f77 Handle bad ninepatch data.
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
2015-01-27 16:41:16 +00:00
Narayan Kamath
56bbefccf2 Merge "Add support for persist.sys.locale." automerge: dca2332 automerge: 117f161
automerge: 1194e75

* commit '1194e754a95e1fa5d4eba6d0bca109156dd4df94':
  Add support for persist.sys.locale.
2015-01-22 14:00:51 +00:00
Narayan Kamath
1194e754a9 Merge "Add support for persist.sys.locale." automerge: dca2332
automerge: 117f161

* commit '117f161fee52dfa200f89282c487d58c29b41d4f':
  Add support for persist.sys.locale.
2015-01-22 13:56:01 +00:00
Narayan Kamath
d30dbb8ae1 Add support for persist.sys.locale.
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
2015-01-22 13:48:20 +00:00
Chris Craik
2ae0733982 Remove DisplayListLogBuffer
Change-Id: I001832fc444b6d532f4a382e0a31cc1d8956dbd8
2015-01-21 14:22:39 -08:00
John Reck
849911a9c4 Move Canvas
Change-Id: I83d557af30fc2d5c69d06eedc0f4d52ac41c4210
2015-01-20 12:39:05 -08:00
Andy Hung
84a6d9e609 Merge "Allow AUDIO_FORMAT_PCM_8_BIT static AudioTrack buffers" 2015-01-16 00:21:17 +00:00
Chris Craik
d5049e2f74 am 04b633c5: am 0de2eca5: am 112e35b4: Merge "Update generationId on bitmaps when decoded into by BitmapRegionDecoder" into lmp-mr1-dev
* commit '04b633c526b3ea72cb13f0c0472673f3baf07625':
  Update generationId on bitmaps when decoded into by BitmapRegionDecoder
2015-01-16 00:06:14 +00:00
Eino-Ville Talvala
950597d032 am 31028fa6: am 1334a6f3: am 8d47bc97: Merge "Camera: Clarify JNI exception message" into lmp-mr1-dev
* commit '31028fa621b0f182f39b1f6d391963e8e6f627fe':
  Camera: Clarify JNI exception message
2015-01-16 00:05:04 +00:00
Chris Craik
04b633c526 am 0de2eca5: am 112e35b4: Merge "Update generationId on bitmaps when decoded into by BitmapRegionDecoder" into lmp-mr1-dev
* commit '0de2eca5fc439e2622cc0cc5a54cd9a5938f67c6':
  Update generationId on bitmaps when decoded into by BitmapRegionDecoder
2015-01-15 23:15:56 +00:00
Chris Craik
112e35b464 Merge "Update generationId on bitmaps when decoded into by BitmapRegionDecoder" into lmp-mr1-dev 2015-01-15 23:04:15 +00:00
Eino-Ville Talvala
31028fa621 am 1334a6f3: am 8d47bc97: Merge "Camera: Clarify JNI exception message" into lmp-mr1-dev
* commit '1334a6f34296094baddc0d4c0c93357532b2a96d':
  Camera: Clarify JNI exception message
2015-01-15 20:13:11 +00:00
Ben Wagner
177612335a Remove last mention of SkFontHost.
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
2015-01-15 14:16:46 -05:00
Chris Craik
3b47713b26 Update generationId on bitmaps when decoded into by BitmapRegionDecoder
bug:18921087

This fixes issues where bitmaps are cached as textures, and not
reuploaded when reused by BitmapRegionDecoder, showing stale content.

Change-Id: I7626fd6acd36d8e38723689734855ce9154eb8c8
2015-01-14 16:55:34 -08:00
Derek Sollenberger
dbf22ccd92 Merge "Update HWUI to store its own SkBitmap objects" 2015-01-14 15:06:27 +00:00
Andy Hung
2c0e17c029 Allow AUDIO_FORMAT_PCM_8_BIT static AudioTrack buffers
Change-Id: I7424455ccff860126ceda432613db67a8933ea1e
2015-01-13 15:41:40 -08:00
Eino-Ville Talvala
f913334749 Camera: Clarify JNI exception message
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
2015-01-12 17:02:03 -08:00
Ben Wagner
c2d39573ca Remove dead code from AssetStreamAdapter.
After "Use at least SkStreamAsset for SkTypefaces." there is now dead
code in AssetStreamAdapter. Remove the code and update the users.

Change-Id: I17a9d82dd6ca4d87a951c1570dc91de7f2fc54f2
2015-01-12 18:13:27 -05:00
Ben Wagner
f462c2491b Use at least SkStreamAsset for SkTypefaces.
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
2015-01-12 15:19:18 -05:00
Ruben Brunk
1bc109b928 am 8f8dc488: resolve merge conflicts of 0f647c1 to lmp-mr1-dev-plus-aosp.
* commit '8f8dc4882bc61b7e273ac991e2ae99834d55b7d0':
  Camera2: Fix early EOF in DngCreator#writeByteBuffer.
2015-01-10 01:24:55 +00:00
Ruben Brunk
8f8dc4882b resolve merge conflicts of 0f647c1 to lmp-mr1-dev-plus-aosp.
Change-Id: Idbf96ab23c02dc7c380d6c3a4a87b1f380446c61
2015-01-09 17:19:45 -08:00
Ruben Brunk
8c52d9a092 Merge "Camera2: Fix early EOF in DngCreator#writeByteBuffer." into lmp-mr1-dev 2015-01-09 23:33:49 +00:00