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

47552 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
The Android Open Source Project
ca5aae2425 Reconcile with jb-mr1-release - do not merge 
Change-Id: I01ed0fa73e80b3868a53238a8e754970da2f6803
 2012-10-11 05:57:17 -07:00
Jesse Hall
b763d5fffa Assume LayerScreenshot has pre-multiplied alpha 
Bug: 7300129
Change-Id: Ie9114adc4b5c9a8cc3c65bfe6d9478b2cba4e0d8
 2012-10-10 21:40:26 -07:00
Andy McFadden
9349b5108c am f0c89b28: Merge "Fix HDMI unblank behavior" into jb-mr1-dev 
* commit 'f0c89b28be2e74c26d74b2a21b7228516f8c236f':
  Fix HDMI unblank behavior
 2012-10-10 19:37:57 -07:00
Andy McFadden
f0c89b28be Merge "Fix HDMI unblank behavior" into jb-mr1-dev 2012-10-10 19:34:11 -07:00
Andy McFadden
9e9689c111 Fix HDMI unblank behavior 
Two issues:

(1) We were announcing the hotplug event before we were ready to
handle blank/unblank events, so we were losing the initial unblank
that power manager sends us when HDMI is first plugged in.  This
left the display blank until you toggled the device power off/on.

(2) We were retaining fbTargetHandle for HDMI after the display was
disconnected.  The value didn't get updated when HDMI was reconnected
because the display was blank, so we didn't go through that code
path.  So, when HDMI was re-connected, we passed stale data into
the HWC.

Bug 7323938

Change-Id: I2335d24fd7b0f00bb23fc63aa7bcf44cb8857c73
 2012-10-10 18:17:51 -07:00
The Android Automerger
a9e3004d69 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-10-10 14:06:39 -07:00
Chet Haase
8b75830c5c am 8d5d2019: Revert "Add GL Error logs (temporary)" 
* commit '8d5d2019805df1f27cbec07eeca47dd5ab453dad':
  Revert "Add GL Error logs (temporary)"
 2012-10-10 13:21:39 -07:00
Chet Haase
8d5d201980 Revert "Add GL Error logs (temporary)" 
This reverts commit 2da2c15068.
 2012-10-10 13:10:40 -07:00
The Android Open Source Project
dc9c3a4f2b Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge 
Change-Id: I9b2354f718f8e792bd040b7fb92f8fd1c77c037a
 2012-10-10 09:44:41 -07:00
The Android Automerger
2de86a4e1b merge in jb-mr1-factory-release history after reset to jb-mr1-dev 2012-10-10 08:55:31 -07:00
The Android Automerger
a4927aea77 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-10-10 06:59:29 -07:00
Mathias Agopian
43bd832d12 am 0acb00c2: Merge "fix typo that prevented proper loging of EGL error code" into jb-mr1-dev 
* commit '0acb00c2d780b60ed3d71be256460375dd8715b4':
  fix typo that prevented proper loging of EGL error code
 2012-10-09 16:57:47 -07:00
Jeff Brown
70f07572f8 am c5b58166: Merge "don\'t automatically unblank external displays" into jb-mr1-dev 
* commit 'c5b58166e8170a415de108a72acfc432dec1b201':
  don't automatically unblank external displays
 2012-10-09 16:56:21 -07:00
Mathias Agopian
0acb00c2d7 Merge "fix typo that prevented proper loging of EGL error code" into jb-mr1-dev 2012-10-09 16:52:37 -07:00
Jeff Brown
c5b58166e8 Merge "don't automatically unblank external displays" into jb-mr1-dev 2012-10-09 16:50:56 -07:00
Mathias Agopian
b8fc00bfb4 fix typo that prevented proper loging of EGL error code 
needed for investigating 7309949

Bug: 7309949
Change-Id: If29a5c08d0e87f46b44ba2e1030be61cb4d1403b
 2012-10-09 16:44:48 -07:00
Mathias Agopian
98e52bdb18 am 45778999: Merge "Fence didn\'t manager sync_wait error codes properly" into jb-mr1-dev 
* commit '45778999c705683ec0fcca3e90c7e9969e081d93':
  Fence didn't manager sync_wait error codes properly
 2012-10-09 16:40:08 -07:00
Mathias Agopian
45778999c7 Merge "Fence didn't manager sync_wait error codes properly" into jb-mr1-dev 2012-10-09 16:36:30 -07:00
Mathias Agopian
3292cae8c3 don't automatically unblank external displays 
this should be handled by the display-manager. we were doing
that in SF because until recently we didn't have enough support
in the HAL. however, this is now causing other problems when
plugging hdmi while the screen is off for instance.

Bug: 7150885
Change-Id: I739b209056a765d38d05295cf202f67ee0f506ae
 2012-10-09 14:49:01 -07:00
Mathias Agopian
b5c9dcdf3b Fence didn't manager sync_wait error codes properly 
error codes are returned in errno, this caused ::waitForwever()
to only wait for 1 second and return improper error code (-1).

needed to help debugging 7316632

Bug: 7316632
Change-Id: Ie144f614a88393393972a3a770c6b4b0581f961a
 2012-10-09 14:38:19 -07:00
The Android Open Source Project
7776457df5 Reconcile with jb-mr1-release - do not merge 
Change-Id: I94b8cbf30ab7707320dc2de4ef8a8102ed5f6091
 2012-10-09 07:29:23 -07:00
The Android Automerger
c0609a2743 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-10-09 06:59:29 -07:00
Jeff Brown
e3a8cd4db1 am 2a09bb32: Add blankDisplay/unblankDisplay to SurfaceComposerClient. 
* commit '2a09bb321930e1f782599ec902bca1db58b9af77':
  Add blankDisplay/unblankDisplay to SurfaceComposerClient.
 2012-10-09 00:04:34 -07:00
Jeff Brown
2a09bb3219 Add blankDisplay/unblankDisplay to SurfaceComposerClient. 
Bug: 7309812
Change-Id: Ia401d642094a46c62f0d26c65da1d11341e203a1
 2012-10-08 19:13:57 -07:00
Mathias Agopian
1a003e4aec am cb55857b: fix dumpsys Layer name when using multiple displays 
* commit 'cb55857bbde34a06c19dde3db5064d1717a0173e':
  fix dumpsys Layer name when using multiple displays
 2012-10-08 16:12:12 -07:00
Mathias Agopian
cb55857bbd fix dumpsys Layer name when using multiple displays 
Bug: 7288401
Change-Id: I14beeef58fac5270cef3b611e18c163060efe6c3
 2012-10-08 15:57:17 -07:00
Jesse Hall
0de75f3f53 Stop using transparent region for computing visible regions (DO NOT MERGE) 
The transparent region hint is computed only from view layout
locations, ignoring post-layout translation. If a SurfaceView is layed
out with no other views above it, but a view is moved above it
post-layout, that view's layout bounds would be subtracted from the
window's transparent region instead of its drawing bounds. Prior to
this change, the view would not be visible (except where its layout
bounds and drawing bounds overlap).

With this change, composition uses visible regions computed without
regard to the transparent regions. However, if all of a layer's
visible region is transparent, it will be removed from the list of
layers to composite. This doesn't fix the root problem of incorrect
transparent regions, and doesn't prevent bad composition in all cases.
But it does avoid it for some existing apps, while still allowing the
transparent region hint to save power in the important
fullscreen-video-in-a-SurfaceView case.

Change-Id: If2d929a10399b80401ef902abb232233a7f3d16d
 2012-10-08 10:56:03 -07:00
Mathias Agopian
eb38d85260 am 1b3aeb48: fix SurfaceFlinger DDMS debugging 
* commit '1b3aeb4844fe198c1fb61064d0cec3f5ac63f7d3':
  fix SurfaceFlinger DDMS debugging
 2012-10-07 23:38:32 -07:00
The Android Automerger
60b974f657 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-10-07 18:58:06 -07:00
Mathias Agopian
1b3aeb4844 fix SurfaceFlinger DDMS debugging 
DdmHandleAppName.setAppName() signature changed which broke
this debugging feature.

Needed for debugging b\7267680

Change-Id: I4482bf5a441e91bef89d1ddea9a4152333be7f88
 2012-10-07 16:41:12 -07:00
Dave Burke
c431c36ed3 am 6d24eef4: Merge "Revert "ugly, temporary, workaroung for a problem where a binder thread spins forever"" into jb-mr1-dev 
* commit '6d24eef4b6443afa8d361437c0a3a575b69609ae':
  Revert "ugly, temporary, workaroung for a problem where a binder thread spins forever"
 2012-10-07 09:07:12 -07:00
The Android Automerger
6e218edaa2 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-10-07 06:59:27 -07:00
Dave Burke
6d24eef4b6 Merge "Revert "ugly, temporary, workaroung for a problem where a binder thread spins forever"" into jb-mr1-dev 2012-10-07 01:06:15 -07:00
Dave Burke
0bed1f541d Revert "ugly, temporary, workaroung for a problem where a binder thread spins forever" 
This reverts commit 0845d0245e

Change-Id: I395037cb9427cd11f7de6bb78fbdfa917fc6263a
 2012-10-06 23:20:00 -07:00
Mathias Agopian
3e9f3b67b1 ugly, temporary, workaroung for a problem where a binder thread spins forever 
Bug: 7289992
Change-Id: I0c3d482a1af57e5f444be2ba7f2751ac3e954af2
 2012-10-06 00:39:26 -07:00
Dave Burke
f757640049 am dba919c5: Merge "ugly, temporary, workaroung for a problem where a binder thread spins forever" into jb-mr1-dev 
* commit 'dba919c5f372872179cd14f8b5beeb4c22fe23c1':
  ugly, temporary, workaroung for a problem where a binder thread spins forever
 2012-10-05 23:29:35 -07:00
Dave Burke
dba919c5f3 Merge "ugly, temporary, workaroung for a problem where a binder thread spins forever" into jb-mr1-dev 2012-10-05 23:25:57 -07:00
Mathias Agopian
0845d0245e ugly, temporary, workaroung for a problem where a binder thread spins forever 
Bug: 7289992
Change-Id: I0c3d482a1af57e5f444be2ba7f2751ac3e954af2
 2012-10-05 17:28:04 -07:00
Jesse Hall
d22e4b914c am 9504eb91: Fix race condition in ConsumerBase::addReleaseFence() 
* commit '9504eb915c9628e130f45019bdefda0168089886':
  Fix race condition in ConsumerBase::addReleaseFence()
 2012-10-05 15:21:21 -07:00
Jesse Hall
9504eb915c Fix race condition in ConsumerBase::addReleaseFence() 
This needs the ConsumerBase mutex locked, but wasn't locking it. Two
of the four places that called it already held the lock so were fine.
Now addReleaseFence() takes the lock itself, and I added
addReleaseFenceLocked() for the two already-locked callers, since in
one of them dropping the lock would be inconvenient.

Bug: 7289269
Change-Id: I7a5628adb516f8eec782aa6c14128202f96d7b0a
 2012-10-05 14:40:50 -07:00
Jean-Baptiste Queru
659ad44558 am f29b86b2: (-s ours) am 76942a49: Merge "egl: Reintroduce eglGetRenderBufferANDROID" 
* commit 'f29b86b26aad5f50c2cae829bcce55fbb9fd8f8b':
  egl: Reintroduce eglGetRenderBufferANDROID
 2012-10-05 13:23:20 -07:00
Jean-Baptiste Queru
f29b86b26a am 76942a49: Merge "egl: Reintroduce eglGetRenderBufferANDROID" 
* commit '76942a49740d6cf53fc5fe3c5a53f4de4011d954':
  egl: Reintroduce eglGetRenderBufferANDROID
 2012-10-05 13:19:56 -07:00
Jean-Baptiste Queru
76942a4974 Merge "egl: Reintroduce eglGetRenderBufferANDROID" 2012-10-05 13:14:29 -07:00
The Android Open Source Project
feb570e404 Reconcile with jb-mr1-release - do not merge 
Change-Id: I6f2d20f646b742314b143f863957623169732bef
 2012-10-05 08:16:53 -07:00
The Android Automerger
0f326b9ab2 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-10-05 06:59:39 -07:00
Stephen Hines
ecbcc4cadb am 0e8fcc2c: Merge "Fix missing parens in CleanSpec.mk." into jb-mr1-dev 
* commit '0e8fcc2c27f278478483ebbe1befe1460e8bbed1':
  Fix missing parens in CleanSpec.mk.
 2012-10-04 21:47:04 -07:00
Stephen Hines
0e8fcc2c27 Merge "Fix missing parens in CleanSpec.mk." into jb-mr1-dev 2012-10-04 21:42:30 -07:00
Mathias Agopian
95b9a0b688 am e835976d: Merge "Tone down a fatal assert" into jb-mr1-dev 
* commit 'e835976d285df80e261546bd4d016dadb45d906d':
  Tone down a fatal assert
 2012-10-04 20:26:52 -07:00
Mathias Agopian
e835976d28 Merge "Tone down a fatal assert" into jb-mr1-dev 2012-10-04 20:24:17 -07:00
Stephen Hines
d920670f25 Fix missing parens in CleanSpec.mk. 
Change-Id: I0440a942d3e685d619ec9cc402d3293cb3f52df1
 2012-10-04 20:05:19 -07:00