ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
47,341 Commits 2 Branches 0 Tags 54 MiB
f676078613
Commit Graph

47341 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mathias Agopian
3fc6a2cebc am c9ea4c8b: Merge "we were sometimes not setting fences properly" into jb-mr1-dev 
* commit 'c9ea4c8b580e73a89984641ed37a3eb417cc86c5':
  we were sometimes not setting fences properly
 2012-08-29 17:26:45 -07:00
Mathias Agopian
c9ea4c8b58 Merge "we were sometimes not setting fences properly" into jb-mr1-dev 2012-08-29 17:24:54 -07:00
Mathias Agopian
85d751cba5 we were sometimes not setting fences properly 
this would happen when the composition was handled
entirely in h/w composer, in this case, we would
not set the fences for any involved layers.

Bug: 7049373
Change-Id: I1439dc156ce23c24041cdfbbebfe8ff4fdf790f8
 2012-08-29 16:59:24 -07:00
Jamie Gennis
e191e6c348 BufferQueue: simplify max buffer count handling 
This change reworks how the maximum buffer count is computed.

Change-Id: I7d3745814b9bd6f6f447f86bfea8eb7729914ebf
 2012-08-29 15:35:34 -07:00
Jamie Gennis
31a353da22 BufferQueue: clean up buffer counting 
This change is a clean up of some of the handling of the maximum number of
buffers that are allowed at once.  It mostly renames a few member variables and
methods, but it includes a couple small refactorings.

Change-Id: I9959310f563d09583548d4291e1050a7bbc7d87d
 2012-08-29 15:35:34 -07:00
Andreas Huber
146ea3eec4 am c1396dd1: Merge "initial checkin of a preliminary HDCP API for vendors to implement." into jb-mr1-dev 
* commit 'c1396dd14506d29e92fc047141d62b3d9246a72d':
  initial checkin of a preliminary HDCP API for vendors to implement.
 2012-08-29 13:34:01 -07:00
Andreas Huber
c1396dd145 Merge "initial checkin of a preliminary HDCP API for vendors to implement." into jb-mr1-dev 2012-08-29 13:32:15 -07:00
Andreas Huber
a8fc772b5b initial checkin of a preliminary HDCP API for vendors to implement. 
Change-Id: If98277efdec1bc8f1e9f4af1ca73324e4c3d469b
 2012-08-29 13:26:55 -07:00
Jesse Hall
9eb1eb5bb5 Handle new device api version encoding 
Change-Id: I3d36058bd5d31c23b3cc4a7eb5aa033b6f3c1955
 2012-08-29 10:39:38 -07:00
The Android Automerger
37a32cb555 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-08-29 06:33:49 -07:00
Wink Saville
d026a1e163 A vendor ril depends on a native screen shot code. 
Add a temporary shim until the vendor fixes the ril.

Bug: 7073467
Change-Id: Ia95a58bd90677c03406c988d1c29ae785f8662f2
 2012-08-28 22:12:54 -07:00
Wink Saville
8f86ff7967 am b82af2a8: Merge "A vendor ril depends on a native screen shot code." into jb-mr1-dev 
* commit 'b82af2a8aec99faf6fd37d202b98224cee461a12':
  A vendor ril depends on a native screen shot code.
 2012-08-28 16:25:13 -07:00
Wink Saville
b82af2a8ae Merge "A vendor ril depends on a native screen shot code." into jb-mr1-dev 2012-08-28 16:22:55 -07:00
Wink Saville
9b5782baf0 A vendor ril depends on a native screen shot code. 
Add a temporary shim until the vendor fixes the ril.

Bug: 7073467
Change-Id: Ia95a58bd90677c03406c988d1c29ae785f8662f2
 2012-08-28 16:20:50 -07:00
Mathias Agopian
cacb4d300b am 7e7ed7f7: the layer list per display could contain non-visible layers 
* commit '7e7ed7f77a3963a3542bde529d2797a239e2798b':
  the layer list per display could contain non-visible layers
 2012-08-28 15:15:12 -07:00
Mathias Agopian
7e7ed7f77a the layer list per display could contain non-visible layers 
this happened because we didn't check that the visible
region was within the bounds of the display.

Bug: 7064121
Change-Id: I2e81850a3dc3d1474253520ad7f9e559c26d5a96
 2012-08-28 14:20:00 -07:00
Mathias Agopian
0596dc8301 am 55801e41: we were not always clearing the screen properly 
* commit '55801e41e6d7306d75d8134dd69d7d8cbbfbc63c':
  we were not always clearing the screen properly
 2012-08-28 12:54:28 -07:00
The Android Automerger
0b19a4f4b8 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-08-28 06:33:51 -07:00
Mathias Agopian
55801e41e6 we were not always clearing the screen properly 
Change-Id: I269dd866e965aebd9b3c4667095818202982f4a3
 2012-08-27 18:54:24 -07:00
Mathias Agopian
c477ea1a95 am 525705c8: Merge "Eradicate DisplayID." into jb-mr1-dev 
* commit '525705c88f91e46099970491282944d4ef0041d4':
  Eradicate DisplayID.
 2012-08-27 18:47:35 -07:00
Mathias Agopian
525705c88f Merge "Eradicate DisplayID." into jb-mr1-dev 2012-08-27 18:45:34 -07:00
Jeff Brown
0385ec0cac am 25e234f1: am f456d32d: (-s ours) am d7007cd4: Merge "Forward compatibility patch." 
* commit '25e234f11ae93b3c882694f0d7ec1d4526ed7526':
  Forward compatibility patch.
 2012-08-27 18:06:09 -07:00
Jeff Brown
25e234f11a am f456d32d: (-s ours) am d7007cd4: Merge "Forward compatibility patch." 
* commit 'f456d32d3c3aea966b5fba43e6d34f72df06c60d':
  Forward compatibility patch.
 2012-08-27 18:03:45 -07:00
Jeff Brown
f456d32d3c am d7007cd4: Merge "Forward compatibility patch." 
* commit 'd7007cd4bb2016a09ae8e8f746118f81fdd27f02':
  Forward compatibility patch.
 2012-08-27 17:57:26 -07:00
Mathias Agopian
3ee454a7be Eradicate DisplayID. 
DisplayDevices are now keyed of the wp<IBinder> the client uses.
DisplayID has now become DisplayType which is just used to identify
physical displays (as opposed to virtual displays such as wifi displays).

Change-Id: I0c5968f2c902dcd699a7e0afacf833ff070c12ea
 2012-08-27 17:43:43 -07:00
Jeff Brown
d7007cd4bb Merge "Forward compatibility patch." 2012-08-27 17:26:06 -07:00
Jeff Brown
451bd1992f am a50b51c0: Compatibility work around for bad graphics driver dependency. 
* commit 'a50b51c03aca449920fc8581a738032a7bce7150':
  Compatibility work around for bad graphics driver dependency.
 2012-08-27 17:23:44 -07:00
Jeff Brown
a50b51c03a Compatibility work around for bad graphics driver dependency. 
This is a compatibility shim for one product whose drivers
are depending on SurfaceComposerClient::getDisplayInfo(
int, DisplayInfo*) when it really shouldn't.

Revert this patch when the problem has been resolved.

Bug: 7065398
Change-Id: I6542691b81fd1b1e1d79500a62e82d40a3d51db7
 2012-08-27 17:20:53 -07:00
Jeff Brown
62eaafef44 am 1ae49e3f: Merge "Remove unused "layer" argument from show()." into jb-mr1-dev 
* commit '1ae49e3fef34ee38f8dfeb08b5914e3362af3b2f':
  Remove unused "layer" argument from show().
 2012-08-27 17:19:35 -07:00
Jeff Brown
0593f9a76a am e310c394: Merge "Banish DisplayID from the SurfaceFlinger API." into jb-mr1-dev 
* commit 'e310c3949f7de7183ef43e751526a5dc4cf0d74c':
  Banish DisplayID from the SurfaceFlinger API.
 2012-08-27 17:19:34 -07:00
Jeff Brown
1ae49e3fef Merge "Remove unused "layer" argument from show()." into jb-mr1-dev 2012-08-27 17:17:09 -07:00
Jeff Brown
e310c3949f Merge "Banish DisplayID from the SurfaceFlinger API." into jb-mr1-dev 2012-08-27 17:16:37 -07:00
Jeff Brown
52142828ee Forward compatibility patch. 
Change-Id: I8e8af0c6035aaac5e5097f1cfb198250475627ee
 2012-08-27 16:44:39 -07:00
Jeff Brown
380223bf1b Remove unused "layer" argument from show(). 
Change-Id: I8944a9f4a27c330b11e5e837c69b88c8f84145ba
 2012-08-27 14:40:17 -07:00
Jeff Brown
9d4e3d2f42 Banish DisplayID from the SurfaceFlinger API. 
Use only display tokens in the API to refer to new displays.

Don't require the caller to specify the display when creating
a surface (since in general a surface could be shown on
any display).

This is intended to be a minimum change just to update the API.
Note that SurfaceFlinger still uses DisplayID in a few places
internally that might cause some features not to work properly
when there are multiple displays (LayerScreenshot, for example).

Change-Id: I3d91eec2da406eefd97bcd53655d403ad865a7e6
 2012-08-27 14:40:17 -07:00
Jean-Baptiste Queru
777bea49e0 am f671385e: am 9801575a: am 908c8ff5: Merge "Fixed clang build error for libgui" 
* commit 'f671385e71644b6f34a06f425aff8dd16ffc0105':
  Fixed clang build error for libgui
 2012-08-27 08:20:05 -07:00
Jean-Baptiste Queru
f671385e71 am 9801575a: am 908c8ff5: Merge "Fixed clang build error for libgui" 
* commit '9801575a65f2f9d0bdc924ec0a4bbfb6ef071bbe':
  Fixed clang build error for libgui
 2012-08-27 08:17:48 -07:00
Jean-Baptiste Queru
9801575a65 am 908c8ff5: Merge "Fixed clang build error for libgui" 
* commit '908c8ff55482b723eddec54c6308e54a136a3e49':
  Fixed clang build error for libgui
 2012-08-27 08:15:12 -07:00
Jean-Baptiste Queru
908c8ff554 Merge "Fixed clang build error for libgui" 2012-08-27 07:55:27 -07:00
The Android Automerger
98112828ca merge in jb-mr1-release history after reset to jb-mr1-dev 2012-08-27 06:34:04 -07:00
The Android Open Source Project
811da2144e Reconcile with jb-mr1-release - do not merge 
Change-Id: I30ec4fc48ccc2a81fd0e5510514ba26a5d85840c
 2012-08-25 07:16:24 -07:00
Mathias Agopian
69d10b4e3b am 225c66a4: Revert "put back the unused virtuals in Vector<>" 
* commit '225c66a48cdc3acef21ee380dc134449749d3cb3':
  Revert "put back the unused virtuals in Vector<>"
 2012-08-24 17:24:54 -07:00
Mathias Agopian
225c66a48c Revert "put back the unused virtuals in Vector<>" 
This reverts commit 1648d4c13b.

Bug: 6977192

Change-Id: Idbb6b239aaed4fb1c054ce943f6ba06ede3492bb
 2012-08-24 17:16:10 -07:00
Andy McFadden
641601d3b2 am 13a082e1: Added display initialization method 
* commit '13a082e160c2d1d8006b93a555a57035213d568b':
  Added display initialization method
 2012-08-24 14:18:11 -07:00
Andy McFadden
13a082e160 Added display initialization method 
The primary display device was being configured to "blank" by
default, which prevented the boot animation from appearing
(unless you got lucky with the hardware composer state).

Bug 6975688

Change-Id: I0fa52e9e719c6e997c5725a7baf15d9718461b78
 2012-08-24 11:50:34 -07:00
Jamie Gennis
f81fa52869 am 0bceb847: surfaceflinger: fix display id selection 
* commit '0bceb84773882b796d9dacbaf96167cb15928d78':
  surfaceflinger: fix display id selection
 2012-08-24 11:18:35 -07:00
Jamie Gennis
21dbb2cd6f am 490aee0f: Merge "SurfaceTexture: inherit from ConsumerBase (try 2)" into jb-mr1-dev 
* commit '490aee0fc5012acf2bf0b1dfe9c09e6fcca606fc':
  SurfaceTexture: inherit from ConsumerBase (try 2)
 2012-08-24 11:13:34 -07:00
Jamie Gennis
0bceb84773 surfaceflinger: fix display id selection 
This change fixes display ID selection so that it never chooses negative
numbers as display IDs.

Change-Id: I5af1acc7b1270b371595e096b18e2a6ad250c7ba
 2012-08-24 11:12:28 -07:00
Jamie Gennis
490aee0fc5 Merge "SurfaceTexture: inherit from ConsumerBase (try 2)" into jb-mr1-dev 2012-08-24 11:11:07 -07:00
Andy McFadden
c17dbaa2c5 am 9b6a395e: Revert "Added display initialization method" 
* commit '9b6a395e65ff88ab79fe92d6f112c434441ca606':
  Revert "Added display initialization method"
 2012-08-24 10:16:43 -07:00