2221 Commits

Author SHA1 Message Date
Romain Guy
3786a9b97a am 07a9ebd1: am b8460d15: Merge "Take into account the texture layer\'s transform for clipping Bug #7370212" into jb-mr1-dev
* commit '07a9ebd1a01bc2819a90ddc98263a24bd6459768':
  Take into account the texture layer's transform for clipping Bug #7370212
2012-10-17 19:21:20 -07:00
Romain Guy
07a9ebd1a0 am b8460d15: Merge "Take into account the texture layer\'s transform for clipping Bug #7370212" into jb-mr1-dev
* commit 'b8460d153a1e6dfc6a02ab127d4b5b5e82386137':
  Take into account the texture layer's transform for clipping Bug #7370212
2012-10-17 19:18:24 -07:00
Romain Guy
b2e2f24706 Take into account the texture layer's transform for clipping
Bug #7370212

Change-Id: Ibdc3161306f54a1cfe66e08458f05ee01a13b1df
2012-10-17 18:18:35 -07:00
Bart Sears
ae232842c8 am b112bb66: am 0ee71add: Merge "Fix native crash while saving a panorama." into jb-mr1-dev
* commit 'b112bb6684b336dc4f3287af65708e0934933d3d':
  Fix native crash while saving a panorama.
2012-10-17 10:26:22 -07:00
Bart Sears
b112bb6684 am 0ee71add: Merge "Fix native crash while saving a panorama." into jb-mr1-dev
* commit '0ee71adde01298784a2cbb667c4c1570bdbf0af0':
  Fix native crash while saving a panorama.
2012-10-17 10:23:42 -07:00
Bart Sears
0ee71adde0 Merge "Fix native crash while saving a panorama." into jb-mr1-dev 2012-10-17 10:20:50 -07:00
Kenny Root
ad0090e7b8 resolved conflicts for merge of 85f9ba9e to jb-mr1-dev-plus-aosp
Change-Id: I9ae49075935f0e9ec432ce9d828ee26a4fcdb44c
2012-10-17 10:02:22 -07:00
Wu-cheng Li
4b63f14c96 Fix native crash while saving a panorama.
YuvToJpegEncoder should handle the case when the height is not
multiples of 16.

bug:7165606

Change-Id: I02f142b233c4f5c0cd8df5e3d1eaebbf62d28052
2012-10-17 18:06:59 +08:00
Kenny Root
c9a1aabc49 Remove HAVE_SELINUX guards
Change-Id: I6c2161471f657aa1645695ffd56ff434b0c2b426
2012-10-16 23:32:31 -07:00
Romain Guy
b7b30eb057 am fa71ba2c: am 1b85122b: Merge "Add API to enable mipmaps on Bitmap Bug #7353771" into jb-mr1-dev
* commit 'fa71ba2c847622c0b23321477b3914f4a4cdd536':
  Add API to enable mipmaps on Bitmap Bug #7353771
2012-10-16 19:11:13 -07:00
Romain Guy
fa71ba2c84 am 1b85122b: Merge "Add API to enable mipmaps on Bitmap Bug #7353771" into jb-mr1-dev
* commit '1b85122bd22c4528679ae8bd67077dfc2fdf1847':
  Add API to enable mipmaps on Bitmap Bug #7353771
2012-10-16 19:08:48 -07:00
Romain Guy
713e1bb9df Add API to enable mipmaps on Bitmap
Bug #7353771

This API can be used when scaling large images down to a small size
to get nicer looking results.

Change-Id: If09087eed36077eee5355f6047a3ca67747d7d9e
2012-10-16 18:44:09 -07:00
Jamie Gennis
b312f1155c am 38041d6b: am 809bb404: Merge "Flag window animation transactions as animations." into jb-mr1-dev
* commit '38041d6b3c3d838d99f70f9b1195d69487edf689':
  Flag window animation transactions as animations.
2012-10-15 20:19:40 -07:00
Jamie Gennis
38041d6b3c am 809bb404: Merge "Flag window animation transactions as animations." into jb-mr1-dev
* commit '809bb404da66498f1723279542d2a7d1f4512052':
  Flag window animation transactions as animations.
2012-10-15 19:54:18 -07:00
Jamie Gennis
b6ce6e42cc Flag window animation transactions as animations.
This change makes WindowManager use the new eAnimation flag when animating
windows.  This prevents some of the window updates from being combined with
updates from prior animation frames.

Bug: 7353840
Change-Id: I5a9f8fa2c1a2f5f08363a45cd9f28bb97cd77080
2012-10-15 19:19:50 -07:00
Keun young Park
09ff8a6f43 am 27665148: am c378656d: Merge "fix wrong read size in ToColor_S4444_Opaque" into jb-mr1-dev
* commit '27665148cb72cbc7d4d5941f97ae54a73fa58d3c':
  fix wrong read size in ToColor_S4444_Opaque
2012-10-12 13:45:46 -07:00
Keun young Park
27665148cb am c378656d: Merge "fix wrong read size in ToColor_S4444_Opaque" into jb-mr1-dev
* commit 'c378656d5e0e686d806661bc271de3c7b1726430':
  fix wrong read size in ToColor_S4444_Opaque
2012-10-12 13:44:08 -07:00
Keun young Park
c378656d5e Merge "fix wrong read size in ToColor_S4444_Opaque" into jb-mr1-dev 2012-10-12 13:41:19 -07:00
Keun young Park
038953da05 fix wrong read size in ToColor_S4444_Opaque
- S4444 takes 16bits, not 32bits
- This caused sporadic failure in CTS BitmapFactoryTest#testDecodeStream4

Bug: 7179389
Change-Id: Ib36a3a569b3149d74f36ae67a069a7b65a72e895
2012-10-12 11:36:13 -07:00
Jeff Brown
7a3314cce7 am af4228c1: am e8f4fa1c: Merge "Fix off-by-one." into jb-mr1-dev
* commit 'af4228c1aa48887fe6811ad8275ed11f34ba0308':
  Fix off-by-one.
2012-10-11 17:13:56 -07:00
Jeff Brown
af4228c1aa am e8f4fa1c: Merge "Fix off-by-one." into jb-mr1-dev
* commit 'e8f4fa1cb3bfd68de235949080f09f9631976275':
  Fix off-by-one.
2012-10-11 16:16:55 -07:00
Jeff Brown
c51cb89dd6 Fix off-by-one.
Bug: 7330567
Change-Id: I8653435c77daefa24991595f68b9f23dd930f14a
2012-10-11 15:58:49 -07:00
Jeff Brown
aabf7a5940 am d2d7d5c8: am 60fa4617: Merge changes I50eb7dcf,I7ae92ce1,Icb22db1c into jb-mr1-dev
* commit 'd2d7d5c8903c7fd6078b16492ee7b21347fce5f2':
  Don't enable input dispatch until the screen is visible.
  Dejank electron beam.
  Don't process UEvents in Dalvik unless they match a pattern.
2012-10-11 00:15:57 -07:00
Jeff Brown
d2d7d5c890 am 60fa4617: Merge changes I50eb7dcf,I7ae92ce1,Icb22db1c into jb-mr1-dev
* commit '60fa4617bc4be292a9e0ae10cf259153dec07aa9':
  Don't enable input dispatch until the screen is visible.
  Dejank electron beam.
  Don't process UEvents in Dalvik unless they match a pattern.
2012-10-10 23:26:05 -07:00
Jeff Brown
9cf36b7a77 Don't process UEvents in Dalvik unless they match a pattern.
On some devices, vsync is delivered from the kernel to userspace
over a netlink socket via UEvent.  The result is that a thread wakes
up, reads a message, creates a new String then searches it for matches
against a pattern on every single frame.

Reduce the overhead by performing the initial pattern matching in
native code.

Bug: 7326329
Change-Id: Icb22db1c38330694207bec1153840e0c06f502d6
2012-10-10 21:46:55 -07:00
Jean-Michel Trivi
afb195453a am 7e466e89: am bcfc1ca8: Merge "Don\'t play notifications during speech recognition" into jb-mr1-dev
* commit '7e466e894ad4738a76c94c871cfc2f900518aea8':
  Don't play notifications during speech recognition
2012-10-10 16:36:07 -07:00
Jean-Michel Trivi
7e466e894a am bcfc1ca8: Merge "Don\'t play notifications during speech recognition" into jb-mr1-dev
* commit 'bcfc1ca8ab8bf057e20d9369af3d007d80ca83e4':
  Don't play notifications during speech recognition
2012-10-10 16:33:15 -07:00
Jean-Michel Trivi
d677054ca6 Don't play notifications during speech recognition
Add support for querying AudioManager to know whether speech
 recognition is currently underway.

Don't play a notification if speech recognition is underway.

Bug 7314859

Change-Id: I1bd013a3168cfe1a6b6dcfd28565e1c3c512eb6a
2012-10-10 12:03:41 -07:00
Eino-Ville Talvala
c2b90f77bd am 685a5128: am cbdb2136: Merge "Camera: Query AudioService for shutter sound enforcement." into jb-mr1-dev
* commit '685a512868a7da11f7097282fd1a4a2af070d816':
  Camera: Query AudioService for shutter sound enforcement.
2012-10-09 15:26:07 -07:00
Eino-Ville Talvala
685a512868 am cbdb2136: Merge "Camera: Query AudioService for shutter sound enforcement." into jb-mr1-dev
* commit 'cbdb21364653910179da1eddd43f4b932420b75b':
  Camera: Query AudioService for shutter sound enforcement.
2012-10-09 15:23:54 -07:00
Eino-Ville Talvala
cbdb213646 Merge "Camera: Query AudioService for shutter sound enforcement." into jb-mr1-dev 2012-10-09 15:21:36 -07:00
Jeff Brown
33c30e36a5 am 102e97bb: am 8f4baad3: Merge "Blank or unblank all displays as need." into jb-mr1-dev
* commit '102e97bb6dda1b211acbc4e6e3d3ae58039c9a0d':
  Blank or unblank all displays as need.
2012-10-09 00:07:05 -07:00
Jeff Brown
102e97bb6d am 8f4baad3: Merge "Blank or unblank all displays as need." into jb-mr1-dev
* commit '8f4baad387d8ad63efbc05cfa8c4e4c472793deb':
  Blank or unblank all displays as need.
2012-10-09 00:05:26 -07:00
Eino-Ville Talvala
4f8e5ce21d Camera: Query AudioService for shutter sound enforcement.
The AudioService now tracks the shutter sound enforcement status, in
addition to the existing approach. Check with it when doing shutter
sound operations.

Bug: 7032634
Change-Id: Ief855d3a36ca5679832cf439f5638b10f70b8636
2012-10-08 23:53:48 -07:00
Jeff Brown
9e316a1a2a Blank or unblank all displays as need.
Ensures that both the internal display and HDMI are blanked
or unblanked in tandem.

Bug: 7309812
Change-Id: Ie8b96d393e8bb20d23c92f3320142d9f7cf42aff
2012-10-08 19:23:15 -07:00
Raph Levien
44d21eb5fc am 6f3f7c68: am 9dc11eb8: Merge "Fix for 7281523 android.text.cts.SelectionTest#testMoveRight failures" into jb-mr1-dev
* commit '6f3f7c681fa824c35b09ebf2978ff853f5a270e3':
  Fix for 7281523 android.text.cts.SelectionTest#testMoveRight failures
2012-10-05 10:59:51 -07:00
Raph Levien
6f3f7c681f am 9dc11eb8: Merge "Fix for 7281523 android.text.cts.SelectionTest#testMoveRight failures" into jb-mr1-dev
* commit '9dc11eb848bfcd463e504133e4e356c7e6497842':
  Fix for 7281523 android.text.cts.SelectionTest#testMoveRight failures
2012-10-05 10:56:41 -07:00
Raph Levien
577b07197b Fix for 7281523 android.text.cts.SelectionTest#testMoveRight failures
The failures were caused by the implementation of doTextRunCursor
passing a too-small value for contextCount into the underlying
getTextRunAdvances call (it wasn't accounting for the start offset).
Thus, when getTextRunAdvances made a copy of the text for its cache key,
it was getting a partial copy.

This patch fixes the size so the cache key always has a full copy of the
text.

Change-Id: I57e3ac6de7aef0e1f1c7000dc3d653f9b0d623d2
2012-10-04 23:15:12 -07:00
Raph Levien
d8c6c6f566 am 1ca8d35f: am 5a829cbf: Merge "Fix for testPaintFlagsDrawFilter CTS test" into jb-mr1-dev
* commit '1ca8d35f4d05a4dcd0d0cc202a3e4a51f35e8655':
  Fix for testPaintFlagsDrawFilter CTS test
2012-10-03 16:02:42 -07:00
Raph Levien
1ca8d35f4d am 5a829cbf: Merge "Fix for testPaintFlagsDrawFilter CTS test" into jb-mr1-dev
* commit '5a829cbf5862d6c41f709b86ed5fc1085fea95ee':
  Fix for testPaintFlagsDrawFilter CTS test
2012-10-03 16:01:15 -07:00
Raph Levien
e174ae210e Fix for testPaintFlagsDrawFilter CTS test
This fixes bug 6948776
android.graphics.cts.PaintFlagsDrawFilterTest#testPaintFlagsDrawFilter
failures on JO

When we moved the drawing of text decorations (underline, strikethrough)
from Skia to our own drawing (so we could take into account the metrics
computed by TextLayoutEngine), we just used the raw flags from the
paint, which ignored the overrides that a DrawFilter can effect.

The patch simply checks for the existence of a DrawFilter in the canvas,
and applies it to a copy of the paint where present. This will be one
extra paint copy where the filter exists, but that's expected to be rare
(other than running this CTS test, of course).

Change-Id: I664c478b73a3a1cc43599ee11bbc02c69b7a96c2
2012-10-03 15:26:47 -07:00
Raph Levien
912c37802c am ad3cc4bb: am 217ca3b0: Merge "Fix for bug 7234184 F/TextLayoutCache: Failed to put an entry..." into jb-mr1-dev
* commit 'ad3cc4bb5eda9b5c56a82e8da0ff3e286bd30cfe':
  Fix for bug 7234184 F/TextLayoutCache: Failed to put an entry...
2012-10-02 13:07:01 -07:00
Raph Levien
ad3cc4bb5e am 217ca3b0: Merge "Fix for bug 7234184 F/TextLayoutCache: Failed to put an entry..." into jb-mr1-dev
* commit '217ca3b0d310472e4df1aa4af72769d7c7a5becb':
  Fix for bug 7234184 F/TextLayoutCache: Failed to put an entry...
2012-10-02 13:04:52 -07:00
Raph Levien
217ca3b0d3 Merge "Fix for bug 7234184 F/TextLayoutCache: Failed to put an entry..." into jb-mr1-dev 2012-10-02 13:02:31 -07:00
Raph Levien
832815cb53 Fix for bug 7234184 F/TextLayoutCache: Failed to put an entry...
This bug was triggered by user code concurrently mutating the character
array while calling into a drawText method in another thread. When the
value of the array changed, it caused inconsistent state, leading to
assert failures.

This is arguably bad behavior by the user code, but it shouldn't cause a
native crash. The fix is to do a defensive copy of the text into the
key, so the value is guaranteed to remain constant throughout the text
layout process. The change is mostly deletion of code, because there was
an optimization to try to avoid such a copy. That optimization was not
actually effective, however, because the indexOfKey() operation in the
KeyedVector underlying the TextLayoutCache did the copy anyway. Thus,
even though this change looks like it's introducing a copy where there
wasn't one before, the actual performance impact should be nil.

Note that the ability to handle a mutating argument is now part of the
contract for TextLayoutEngine::getValue(), and is now documented. That
contract may change, as the result of future optimization. Also, care
was taken to only use the value after the copy.

Other performance issues with TextLayoutCache are tracked in bug
7271109.

Change-Id: I9c90e8e4d501f3f37e2f22a7851f032808d46fbe
2012-10-02 12:32:40 -07:00
Ian Rogers
bc8c3c05a3 am 7fef2b8a: Fix target utilization property_get.
* commit '7fef2b8a3782a94e1ad6bfef98807167db300aab':
  Fix target utilization property_get.
2012-10-01 17:35:24 -07:00
Ian Rogers
7fef2b8a37 Fix target utilization property_get.
Copy and paste error where wrong compare meant the code thought a target
utilization option was specified even if there wasn't one.

b/7062303

Change-Id: Ibf1c6cf72743c5fbec7618a719d12d0373184754
2012-10-01 17:30:32 -07:00
Ian Rogers
e983008863 Fix target utilization property_get.
Copy and paste error where wrong compare meant the code thought a target
utilization option was specified even if there wasn't one.

b/7062303

Change-Id: Ibf1c6cf72743c5fbec7618a719d12d0373184754
2012-10-01 14:59:39 -07:00
Chet Haase
1dd002214e am bcdaf8cb: am 62ea4363: Merge "Fix texture corruption" into jb-mr1-dev
* commit 'bcdaf8cb6d75d721507739504732e0e3dc7f437c':
  Fix texture corruption
2012-10-01 10:16:25 -07:00
Chet Haase
bcdaf8cb6d am 62ea4363: Merge "Fix texture corruption" into jb-mr1-dev
* commit '62ea4363362526d32b48f920601d3b4e27a117bb':
  Fix texture corruption
2012-09-30 15:56:39 -07:00