3720 Commits

Author SHA1 Message Date
Jean-Michel Trivi
a1d80e3b1d AudioTrack Java constructor with AudioAttributes and AudioFormat
Change-Id: I82758a4231b8dc0b8d8e72acf3c896a289c28f60
2014-06-24 17:02:06 -07:00
Dianne Hackborn
04d480e1c3 Merge "Fix some problems with proc stats collection." 2014-06-24 17:32:43 +00:00
Dianne Hackborn
306af678a5 Fix some problems with proc stats collection.
Also start debugging why we aren't being able to open
/proc files.

Change-Id: I4655904691ac22108c29858cbd01153a251ccbf5
2014-06-24 15:41:03 -07:00
Igor Murashkin
5096defdaa camera2: (legacy) Write the JPEG size as part of the blob transport
This fixes StillCaptureTest#testStillPreviewCombination

Change-Id: Ifbaae7828b2efcc1a768c77ce50718abd7f691d0
2014-06-24 18:29:18 +00:00
Chris Craik
2ce932832e Fix xfermode usage in GLES20Canvas.drawColor
bug:15762917

Was previously casting the SkPorterDuff::Mode directly into
SkXfermode::Mode, which is incorrect. Now convert as a first step, as
Canvas does.

Change-Id: I66695b08866ca2008b17f2ff30a36d9ed4d2ed80
2014-06-23 19:15:45 -07:00
John Reck
3b20251a35 No-fail invokeFunctor
Bug: 15513308
 Bug: 15449247

Change-Id: I13a29f9c8d4975cdda6dcb33b6332c2555ff0f7c
2014-06-23 15:26:49 -07:00
Vineeta Srivastava
97a6c20a6a Merge "Removed hack for fingerprint HAL." 2014-06-20 00:20:03 +00:00
Calin Juravle
fc0fa9abd2 am ac777c82: am 3e836835: am a06f5fa6: Merge "Fix the initialization of some profile properties"
* commit 'ac777c821958e68a3be41d11d97aefa9182eab5a':
  Fix the initialization of some profile properties
2014-06-23 19:54:05 +00:00
Calin Juravle
ac777c8219 am 3e836835: am a06f5fa6: Merge "Fix the initialization of some profile properties"
* commit '3e8368350e4098a5a5bd88fc2cb623f58c012ba2':
  Fix the initialization of some profile properties
2014-06-23 19:44:53 +00:00
Vineeta Srivastava
a2e897428a Removed hack for fingerprint HAL.
Change-Id: Idb5c464950a83db337b8e9d5bc44487cc8b129e0
2014-06-21 02:07:23 -07:00
Chris Craik
a7090e0cfd Update 'DisplayList' vs 'RenderNode' naming in several places
Change-Id: I635c6627d098b661fb9b0ba1bd42fa6d7277d287
2014-06-23 09:57:07 -07:00
Elliott Hughes
19597647f9 am ff6b0e24: am f1896106: Merge "Fixed VM memory leak in AudioSystem JNI interface"
* commit 'ff6b0e24725c642f0681e214f143a8151e4e6bea':
  Fixed VM memory leak in AudioSystem JNI interface
2014-06-20 16:34:36 +00:00
Calin Juravle
a06f5fa656 Merge "Fix the initialization of some profile properties" 2014-06-20 03:03:45 +00:00
Elliott Hughes
f18961066b Merge "Fixed VM memory leak in AudioSystem JNI interface" 2014-06-20 02:09:57 +00:00
Ruben Brunk
5e6421bd8f Merge "camera2: Switch to using YV12 for ImageReader." 2014-06-20 20:43:34 +00:00
Ruben Brunk
91b9aabc9f camera2: Switch to using YV12 for ImageReader.
Bug: 15116722

- Also fixes incorrect frame number for single captures.

Change-Id: I8552124d18ad176e6724f089a1e3a3f49a5eeec4
2014-06-20 15:59:00 -07:00
Igor Murashkin
60679f6b7d Merge "camera: Get detailed error reporting from api1 Camera if open fails" 2014-06-20 18:26:34 +00:00
Igor Murashkin
a1d662716b camera: Get detailed error reporting from api1 Camera if open fails
* Also maps camera2 open errors the same for shim/nonshim paths

Change-Id: I08d9d1e30e72025c41bd54b702d7ae95b32257be
2014-06-20 11:26:39 -07:00
Mike Reed
402c8f5a07 Merge "stop using (deprecated) SkBitmap::Config" 2014-06-20 00:30:35 +00:00
Mike Reed
b933055cf3 stop using (deprecated) SkBitmap::Config
Change-Id: Ic75b5fc6996578e9d95bd3a220439ec1541d7c3b
2014-06-20 10:28:37 -04:00
Elliott Hughes
f44d499956 am 19597647: am ff6b0e24: am f1896106: Merge "Fixed VM memory leak in AudioSystem JNI interface"
* commit '19597647f957c4f9755af2f405160f76460ca26d':
  Fixed VM memory leak in AudioSystem JNI interface
2014-06-20 18:19:42 +00:00
Zhijun He
6e335c44c6 Merge "Camera: Implement HAL1 and higher HAL API coexistence" 2014-06-19 20:37:59 +00:00
Zhijun He
4c91380114 Camera: Implement HAL1 and higher HAL API coexistence
A higher hal version device like HAL3.2 can be opened as HAL1.0 device
if HAL supports it. This only applies to camera API1.

Change-Id: I4ae9f59f4317158cc1bd7ed7726e4032cdd1fa07
2014-06-19 15:46:02 -07:00
Calin Juravle
e279cd6d21 Fix the initialization of some profile properties
Change-Id: I959cb53f262cfb9d1621e4cd99bec05514f7f11f
2014-06-19 18:51:47 +01:00
Colin Cross
0ead2a00f4 am 15967d0a: am 88b37eda: Merge "Fix reading memory usage for 64-bit processes"
* commit '15967d0a8f8f858b0ed6aaf9d5aab5c65b94257f':
  Fix reading memory usage for 64-bit processes
2014-06-17 22:53:09 +00:00
Colin Cross
88b37edaea Merge "Fix reading memory usage for 64-bit processes" 2014-06-17 21:47:03 +00:00
Colin Cross
0c6bc73c5e Fix reading memory usage for 64-bit processes
64-bit process will have virtual addresses that don't fit in an
unsigned long if ActivityManagerService is in a 32-bit process,
and the locations of the '-' and ' ' characters in the maps
are not predictable.  Fix the sscanf for finding the start of the
mapping, and use it again to find the end of the mapping.  Also
fix a few 64-bit warnings.

Change-Id: I8855c76085142768be1d45346f1032fd37cbe4eb
2014-06-17 15:25:45 -07:00
Raph Levien
17e64ffd85 Merge "Use Minikin grapheme cluster breaking" 2014-06-17 21:43:29 +00:00
Raph Levien
e368b6bcfd Use Minikin grapheme cluster breaking
This patch uses the Minikin implementation of grapheme cluster breaking,
which improves the behavior of left and right arrow keys for moving the
cursor. Among other things, it fixes the behavior of jumping over the
"fi" ligature in Roboto.

Part of a fix for b/15653110 Improve behavior of arrow keys in EditText

Change-Id: I80ca54c973d85c49f23b81d51a0fe07a7a853d81
2014-06-19 11:51:54 -07:00
Raph Levien
3f0d616722 Simple implementation of drawPosText
The existing implementation of drawPosText is broken in various subtle
ways, in any case doesn't work with Minikin. This patch just implements
it by drawing a separate run for each Unicode character, which should
have the least surprising results for complex scripts such as Khmer.

Part of b/11750374 Resolve TODO items for Minikin

Change-Id: I874ae3c163f0cbe3cdf0160564fab04305aed5aa
2014-06-19 11:22:45 -07:00
Raph Levien
580ecd4b2b Merge "Simple implementation of drawPosText" 2014-06-19 14:48:39 +00:00
Eric Laurent
ff0d9f098e AudioTrack: Add support for compressed audio
Add AudioFormat encoding definitions for compressed audio
and modify AudioTrack to accept compressed audio data.

Bug: 9428304.

Change-Id: Ib85a4d0d78af45924328f4d2d2ffebe83f4a00c5
2014-06-19 10:13:33 -07:00
John Reck
ca48160138 Merge "Throw ISE on too-big-views-with-layers" 2014-06-17 21:43:29 +00:00
John Reck
c25e506f7f Throw ISE on too-big-views-with-layers
Bug: 12971954

Change-Id: I3ef995e91f236014b0a72a90846ef19ce6dc42b1
2014-06-18 14:31:52 -07:00
Derek Sollenberger
a0dc404092 Fix namespace for picture
Change-Id: Id21ebcf2ba4befb4af15cd1d493428a64599afc1
2014-06-18 15:17:50 -04:00
Raph Levien
c802c8cda2 Merge "Implement drawTextOnPath with Minikin" 2014-06-17 21:46:58 +00:00
Raph Levien
9d2b5e1930 Implement drawTextOnPath with Minikin
This patch contains an implementation of drawTextOnPath for both
software and hardware Canvas using Minikin for text layout. One of the
steps for switching all remaining text operations to Minikin so the old
TextLayout and Skia fallback fonts mechanisms can be deleted.

Bug: 11750374 Resolve TODO items for Minikin
Change-Id: I06bfe74a101fa1dcdfc38f530f7194d71e522a85
2014-06-18 11:04:24 -07:00
Derek Sollenberger
bc8bd76bc7 Merge "Refactor android.graphics.Picture JNI bindings." 2014-06-17 21:13:21 +00:00
Andy McFadden
50b9fcfae1 Merge "Add two new display info fields" 2014-06-17 20:49:29 +00:00
Colin Cross
7e31bb6c76 am 0ead2a00: am 15967d0a: am 88b37eda: Merge "Fix reading memory usage for 64-bit processes"
* commit '0ead2a00f4eebb36c2c1206e156fbf1543ee0dd6':
  Fix reading memory usage for 64-bit processes
2014-06-17 22:56:49 +00:00
Jim Miller
cd589baba9 Merge "First pass at FingerprintService integration with HAL. Move FingerprintService to framework services directory Fix merge conflicts." 2014-06-17 21:07:42 +00:00
Jim Miller
a7596147b4 First pass at FingerprintService integration with HAL.
Move FingerprintService to framework services directory
Fix merge conflicts.

Tested: scanning, enrolling, removing.

Change-Id: I58b2b902cb671dc82cdaa54a195ba5f1a154622c
2014-06-17 14:03:37 -07:00
Antonio Calabrese
2460958133 Added primitive parameters to various functions requiring rectangles.
Change-Id: I5a2678fa989f0ff34404b8236787a8153b05f113

bug:14322352
2014-06-17 20:17:59 +00:00
Derek Sollenberger
4b0959d8db Refactor android.graphics.Picture JNI bindings.
This is the first CL in a series of CLs to refactor the Graphics JNI bindings.

bug: 15672762
Change-Id: I1455fa1330c7426407c06eeaad81ad37a57373b1
2014-06-17 15:31:43 -04:00
Andy McFadden
e8b1aeb51e Add two new display info fields
This adds SurfaceFlinger's app VSYNC offset and buffer deadline
values to DisplayInfo.  The values will be available to apps
through queries on a Display object (currently hidden).

Bug 14612039

Change-Id: I48760f58a9d74d99651b02a9d595f420410f2bb5
2014-06-17 11:13:58 -07:00
Anish Athalye
a7aa1b0aa5 Implement Paint.breakText() using Minikin
Change-Id: I36cee2d840ce1bd24a9a06f0c680880396b7398a
2014-06-17 00:31:19 +00:00
Raph Levien
466cd7a2a6 Merge "Clean up dirFlags / bidiFlags confusion" 2014-06-16 22:12:26 +00:00
Raph Levien
051910b9f9 Clean up dirFlags / bidiFlags confusion
The dirFlags and bidiFlags enums are distinct, and have different
meanings. The former is a determined direction for a run of text, while
the latter is a request for the bidi algorithm. They have been used
interchangeably, and this has caused some problems, notably running the
bidi algorithm needlessly when the direction for a run is already
determined.

This patch cleans up the confusion, by always naming each occurrence
explicitly "boolean isRtl" or "int bidiFlags" (the previous code often
just used "int flags", which added to the confusion), and converts
between the meanings when a function takes an isRtl argument but passes
it to another function expecting bidiFlags.

Fixes b/15089607 Clean up bidi flag mess

Change-Id: I410b6604376e853dd12c255e7f5a9d2b9a310dd9
2014-06-16 14:36:08 -07:00
Colin Cross
289476b65b am a803542a: am cb634bda: Merge "clean up native com.android.internal.os.Zygote"
* commit 'a803542aad4a58fe2446b8bf9cc4a4f59942d084':
  clean up native com.android.internal.os.Zygote
2014-06-16 20:19:05 +00:00
Colin Cross
18cd9f5762 clean up native com.android.internal.os.Zygote
This is never compiled for the host any more, so remove all the
unnecesarry ifdefs.

Change-Id: I757e6d604b7f41476ac1021f5bdbc777eac6f99e
2014-06-16 12:22:56 -07:00