drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
93,323 Commits 1 Branch 0 Tags
Commit Graph

2237 Commits

Author SHA1 Message Date
Irfan Sheriff
37794c200f am f264e8e3: am 567a2919: Merge "Stop supplicant and dhcp before start" into jb-mr1.1-dev 
* commit 'f264e8e34e32bfb8e7e75b61b9da9b6f219690b0':
  Stop supplicant and dhcp before start
 2012-11-08 06:14:33 -08:00
Elliott Hughes
9197d170b7 am fec5f611: Merge "It\'s 2012. We\'re always WITH_JIT." 
* commit 'fec5f611fef4fc3b7afa5d7194f4f40d156157ac':
  It's 2012. We're always WITH_JIT.
 2012-11-07 10:48:26 -08:00
Irfan Sheriff
f264e8e34e am 567a2919: Merge "Stop supplicant and dhcp before start" into jb-mr1.1-dev 
* commit '567a2919f3ad66dcb972e45411d18a4515d9f0b1':
  Stop supplicant and dhcp before start
 2012-11-06 17:43:05 -08:00
Elliott Hughes
be8b47f6ce It's 2012. We're always WITH_JIT. 
Change-Id: Ia3d1a1b1df06816f2cfa3879ec669b34c62cf9b9
 2012-11-06 17:16:21 -08:00
Irfan Sheriff
511d5346ce Stop supplicant and dhcp before start 
Bug: 7227463
Change-Id: Iaa0df7522edc38d25fae2bbda8d24490e997e733
 2012-11-06 15:53:32 -08:00
Jamie Gennis
fec93f6719 am 39c68da5: am cd79b35c: Merge "Surface: add the PhysicalDisplayInfo#secure field" into jb-mr1-dev 
* commit '39c68da57b443c869378263b8063da6e821a1b6d':
  Surface: add the PhysicalDisplayInfo#secure field
 2012-10-23 15:27:10 -07:00
Jamie Gennis
39c68da57b am cd79b35c: Merge "Surface: add the PhysicalDisplayInfo#secure field" into jb-mr1-dev 
* commit 'cd79b35c3828e0ebf4c9e68da75f9d857ccf01db':
  Surface: add the PhysicalDisplayInfo#secure field
 2012-10-23 15:24:29 -07:00
Jamie Gennis
cd79b35c38 Merge "Surface: add the PhysicalDisplayInfo#secure field" into jb-mr1-dev 2012-10-23 15:22:37 -07:00
Jamie Gennis
95429c3d1b Surface: add the PhysicalDisplayInfo#secure field 
Bug: 7368436
Change-Id: I38bf7bbfca354380c30da7516f628cf40416d350
 2012-10-23 15:07:22 -07:00
Chet Haase
85c1aef929 am 6534dd02: am 74261d84: Merge "Don\'t null the reference to Bitmap pixels until we\'re really ready" into jb-mr1-dev 
* commit '6534dd0275c8d01de7e7400ba239d203c37c8164':
  Don't null the reference to Bitmap pixels until we're really ready
 2012-10-22 15:52:20 -07:00
Chet Haase
6534dd0275 am 74261d84: Merge "Don\'t null the reference to Bitmap pixels until we\'re really ready" into jb-mr1-dev 
* commit '74261d847f64ccfeba0a7f08f6c59473a3b6647d':
  Don't null the reference to Bitmap pixels until we're really ready
 2012-10-22 15:49:22 -07:00
Chet Haase
74261d847f Merge "Don't null the reference to Bitmap pixels until we're really ready" into jb-mr1-dev 2012-10-22 15:46:43 -07:00
Chet Haase
547e66531d Don't null the reference to Bitmap pixels until we're really ready 
A change in the VM triggers a native memory error more aggressively than before,
showing that there's a bug in the logic of recycling bitmaps. Since the pixel
memory is allocated on the Java heap, nulling out the reference to that memory
in the Java level Bitmap object can cause that memory to get collected at any time.
Meanwhile, we may have a reference to that memory at the native level for rendering
purposes, causing an error if/when we access that memory after it has been collected
by the VM.

The fix is to avoid setting the reference to the pixels to null unless we are
not referring to it in native code. This is determined at the time we call
recycle() - we return a boolean to indicate whether the native code is still
using the memory. if not, the Java code can null out the reference and allow the
VM to collect it. Otherwise, it will get collected later when the encompassing
Bitmap object is collected.

Issue #7339156 HTML5 tests crash the app (Vellamo)

Change-Id: I3a0d6b9a6c5dd3b86cc2b0ff7719007e774b5e3c
 2012-10-22 15:25:19 -07:00
Jamie Gennis
5bbfcd3e15 am 9fee7bd7: am 23d62241: Merge "Set the secureness when creating displays" into jb-mr1-dev 
* commit '9fee7bd73d1231172267cde99d2374cf072c2dca':
  Set the secureness when creating displays
 2012-10-22 13:54:53 -07:00
Jamie Gennis
9fee7bd73d am 23d62241: Merge "Set the secureness when creating displays" into jb-mr1-dev 
* commit '23d622418b5c67dc43faabd930d1c59c5ce34f6a':
  Set the secureness when creating displays
 2012-10-22 13:52:12 -07:00
Jamie Gennis
7bbf8163fb Set the secureness when creating displays 
This change makes use of the new 'secure' argument to the
ISurfaceComposer::createDisplay method.  In this change both the overlay and
wifi displays are hard-coded to be non-secure displays.

Bug: 7368436
Change-Id: Ib65312f2adab5104d8deefbfc32af9dc106a9129
 2012-10-19 18:34:35 -07:00
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