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

47818 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mathias Agopian
4dae9ebd80 am eb38d852: am 1b3aeb48: fix SurfaceFlinger DDMS debugging 
* commit 'eb38d85260073470e5a27af820fe6cd9f2bc35ae':
  fix SurfaceFlinger DDMS debugging
 2012-10-07 23:41:57 -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
f8aad32c8c am c431c36e: am 6d24eef4: Merge "Revert "ugly, temporary, workaroung for a problem where a binder thread spins forever"" into jb-mr1-dev 
* commit 'c431c36ed30d4c01af58e67e17f53caf8be581b6':
  Revert "ugly, temporary, workaroung for a problem where a binder thread spins forever"
 2012-10-07 09:10:03 -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
dec6db5b47 am f7576400: am dba919c5: Merge "ugly, temporary, workaroung for a problem where a binder thread spins forever" into jb-mr1-dev 
* commit 'f757640049a2ae19ba5047362f7fee47d9fb8ab7':
  ugly, temporary, workaroung for a problem where a binder thread spins forever
 2012-10-05 23:31:33 -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
e39dee276e am d22e4b91: am 9504eb91: Fix race condition in ConsumerBase::addReleaseFence() 
* commit 'd22e4b914c01342c09ef2e0279dc705fe6f7f753':
  Fix race condition in ConsumerBase::addReleaseFence()
 2012-10-05 15:22:09 -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
2ef7871b19 am 659ad445: am f29b86b2: (-s ours) am 76942a49: Merge "egl: Reintroduce eglGetRenderBufferANDROID" 
* commit '659ad445589b0a9e0e746b5d5a4ba595204ad2e0':
  egl: Reintroduce eglGetRenderBufferANDROID
 2012-10-05 13:25:07 -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
6414034394 am feb570e4: (-s ours) Reconcile with jb-mr1-release - do not merge 
* commit 'feb570e404c32753025b3b6e7950db7e8648a248':
  make sure we don't call into the HWC HAL when not needed
  Fix crashes after HDMI disconnect
 2012-10-05 08:20:35 -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
3019a5fa86 am ecbcc4ca: am 0e8fcc2c: Merge "Fix missing parens in CleanSpec.mk." into jb-mr1-dev 
* commit 'ecbcc4cadb52bd501788c45f7cbfff9a503e2b12':
  Fix missing parens in CleanSpec.mk.
 2012-10-04 21:48:33 -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
8b2a88bad1 am 95b9a0b6: am e835976d: Merge "Tone down a fatal assert" into jb-mr1-dev 
* commit '95b9a0b688eab5a3c0c1fadb71e258e93e4c344c':
  Tone down a fatal assert
 2012-10-04 20:34:46 -07:00
Chet Haase
b39844e251 am 9c58d96f: am 27b28fd9: Merge "Add GL Error logs (temporary)" into jb-mr1-dev 
* commit '9c58d96f0079e627004c606436df27fa97ff4c8e':
  Add GL Error logs (temporary)
 2012-10-04 20:34:36 -07:00
Raph Levien
ffe901c2b4 am dca9d135: am 3fbbd076: Fix broken CleanSpec.mk in libs/gui 
* commit 'dca9d13581d4d14701d8a207ed647c94ffb1778c':
  Fix broken CleanSpec.mk in libs/gui
 2012-10-04 20:34:23 -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
Chet Haase
9c58d96f00 am 27b28fd9: Merge "Add GL Error logs (temporary)" into jb-mr1-dev 
* commit '27b28fd9960b73a1f13e22dd6655f75e2e76eef7':
  Add GL Error logs (temporary)
 2012-10-04 19:48:12 -07:00
Chet Haase
27b28fd996 Merge "Add GL Error logs (temporary)" into jb-mr1-dev 2012-10-04 19:45:17 -07:00
Raph Levien
dca9d13581 am 3fbbd076: Fix broken CleanSpec.mk in libs/gui 
* commit '3fbbd076ad571810d9107ed870cfce2e8c062d10':
  Fix broken CleanSpec.mk in libs/gui
 2012-10-04 19:37:42 -07:00
Andy McFadden
5a8f9012ee Tone down a fatal assert 
The new disconnectDisplay function doesn't handle virtual displays,
but it may be called for them.  Return without doing anything.

Bug 7281786

Change-Id: I62607f2ae6073fa66b393f55932604aeb8e03566
 2012-10-04 19:09:45 -07:00
Raph Levien
3fbbd076ad Fix broken CleanSpec.mk in libs/gui 
The CleanSpec is missing parens, which causes $P to be interpreted as a
single variable, and the following printed to the log:

Clean step: rm -rf RODUCT_OUT/obj/SHARED_LIBRARIES/libgui_intermediates

This patch adds parens as needed.

Change-Id: I587998fa67a4884418c286360a577cdbb6ea9a21
 2012-10-04 19:00:45 -07:00
Mathias Agopian
947abbdd2c make sure we don't call into the HWC HAL when not needed 
when enabling/disabling vsync we now make sure to
not call into the HAL if the state wouldn't change.

Bug: 7274951

Change-Id: Ie24a6d68888a51b577acf9c2a973d85437cbacaf
 2012-10-04 18:06:03 -07:00
Jesse Hall
178652a5d7 am 3b4e55c0: am 9a143922: Ignore display state changes for disconnected displays 
* commit '3b4e55c0442322823898dd838cb50fe589e1e9d7':
  Ignore display state changes for disconnected displays
 2012-10-04 18:01:50 -07:00
Jesse Hall
3b4e55c044 am 9a143922: Ignore display state changes for disconnected displays 
* commit '9a14392256354538f1f43a5e80fe46c2c2b965cb':
  Ignore display state changes for disconnected displays
 2012-10-04 17:59:26 -07:00
Chet Haase
2da2c15068 Add GL Error logs (temporary) 
Adding logs to tell which specific methods throw OpenGL errors.

Change-Id: I1d73c7566ed1ea6610392020411762c6255a0ede
 2012-10-04 17:15:59 -07:00
Jesse Hall
9a14392256 Ignore display state changes for disconnected displays 
When a display is disconnected, removing it from SurfaceFlinger's
display list is non-atomic with removing it from the Display Manager
and any in-flight transactions. So SurfaceFlinger might get a display
state change transaction for a display it has already forgotten about.
Just ignore these.

Bug: 7288082
Change-Id: Ic27e55377f3db40fb34e3b1cd67e43297df117a2
 2012-10-04 16:40:35 -07:00
Mathias Agopian
1c19de6c28 am 64a22423: am 81cd5d3b: make sure we don\'t call into the HWC HAL when not needed 
* commit '64a224236d930921581de52eb87ef1ab7fab3780':
  make sure we don't call into the HWC HAL when not needed
 2012-10-04 15:31:51 -07:00
Mathias Agopian
64a224236d am 81cd5d3b: make sure we don\'t call into the HWC HAL when not needed 
* commit '81cd5d3b94d21253a0be925f4ae58cc7f4afeef7':
  make sure we don't call into the HWC HAL when not needed
 2012-10-04 15:29:22 -07:00
Mathias Agopian
81cd5d3b94 make sure we don't call into the HWC HAL when not needed 
when enabling/disabling vsync we now make sure to
not call into the HAL if the state wouldn't change.

Bug: 7274951

Change-Id: Ie24a6d68888a51b577acf9c2a973d85437cbacaf
 2012-10-04 15:25:32 -07:00
Andy McFadden
eb1caaea69 Fix crashes after HDMI disconnect 
The display was being removed from SurfaceFlinger's list before we
had a chance to reset HWComposer's layer list, so we were passing
stale data into the hardware composer (which has its own per-display
data).  This resulted in "invalid gralloc handle" complaints.
We now clear the layer list immediately after removing the display.

The display was being removed while its EGLSurface was still
"current", resulting in "cancelBuffer: BufferQueue has been
abandoned" complaints.  We now call makeCurrent on the primary
display before removing the external display.

Bug 7274254

Change-Id: Ia59e3a61d7ec46488b96bf93ec5e4ed3488b70e4
 2012-10-04 14:42:03 -07:00
Andy McFadden
42d7dfccee am 61f142a2: am 27ec5739: Fix crashes after HDMI disconnect 
* commit '61f142a25c14c8e24f8040098b4c223f0d725cb2':
  Fix crashes after HDMI disconnect
 2012-10-04 12:29:00 -07:00
Andy McFadden
61f142a25c am 27ec5739: Fix crashes after HDMI disconnect 
* commit '27ec5739bc05330e08b02f25b62a8f597bad897a':
  Fix crashes after HDMI disconnect
 2012-10-04 12:11:11 -07:00
The Android Open Source Project
07f86ae970 am af4324cc: (-s ours) Reconcile with jb-mr1-release - do not merge 
* commit 'af4324cc0ad6fb4d4a7716ebff2421424c4a2292':
  Fix issue #7271589: Cannot set Ocean HD live wallpaper
 2012-10-04 07:52:23 -07:00