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

47537 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mathias Agopian
8a2b54235a Merge "libagl: Transform the vertex if using eye space lighting with point lights" 2012-09-19 19:31:53 -07:00
Mathias Agopian
3a24e8f160 Merge changes I561c198c,Id4865f3c into jb-mr1-dev 
* changes:
  improve sensor battery usage tracking
  track UID with connections
 2012-09-19 16:26:31 -07:00
Mathias Agopian
d56eff2f49 fix typo in DisplayDevice logs 
Change-Id: I593ef674f12073bd9d690946447031394ef9044e
 2012-09-19 16:25:29 -07:00
Ben Cheng
971f7e9f5d Disable the use of clock_gettime for now. 
Bug: 7100774
Change-Id: I6ede2a37a5d485134fe419b5dc766f70ae4af9d4
 2012-09-19 14:53:10 -07:00
Deva Ramasubramanian
dbaaa38882 frameworks/native: Amend HDCP API 
- Allow caller to set the observer and cookie.
- Add more notifications that the HDCPModule can send to its Observer.

Change-Id: I8bf9cc02a029cd38bbd25d9f0a634452173f4d26
Signed-off-by: Deva Ramasubramanian <dramasub@codeaurora.org>
 2012-09-19 11:17:36 -07:00
The Android Automerger
8e517cbc75 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-09-19 07:01:38 -07:00
Mathias Agopian
d37e1e688e am 3cdccc6f: Merge "fix a typo in SensorService" into jb-mr1-dev 
* commit '3cdccc6f852be345c43bdfbc2466aa17c1173c9c':
  fix a typo in SensorService
 2012-09-18 23:35:42 -07:00
Mathias Agopian
787ac1b388 improve sensor battery usage tracking 
until now we were tracking when a sensors was
physically enabled or disabled and we were reporting
that to the BattaryService.

this wasn incorrect because we could have several different
apps enabling the same sensor, so the accounting by the
battery service would be incorrect in that case (depending
on the order in which these apps disabled said sensor).

BatteryService tracks sensors per uid, however SensorService
does this per binder connection, so we could have several
binder connections for the same uid, to solve this we keep
a list of sensor/uid -> count, which is the bulk of this
change.

Bug: 6661604
Change-Id: I561c198c42ba1736a8671bdacda4c76d72b9dd6f
 2012-09-18 23:33:36 -07:00
Mathias Agopian
5307d17fe3 track UID with connections 
Change-Id: Id4865f3cd27a95acdbbfdff1f2bb4123f312a13b
 2012-09-18 23:33:36 -07:00
Mathias Agopian
3cdccc6f85 Merge "fix a typo in SensorService" into jb-mr1-dev 2012-09-18 23:33:20 -07:00
Iliyan Malchev
bda132e3cd am 2398bc67: Merge "gui: conditionally set USE_NATIVE_FENCE_SYNC for msm8960" into jb-mr1-dev 
* commit '2398bc67bb04e9f087fd46455bf8ff1ce4eb510f':
  gui: conditionally set USE_NATIVE_FENCE_SYNC for msm8960
 2012-09-18 20:30:07 -07:00
Iliyan Malchev
2398bc67bb Merge "gui: conditionally set USE_NATIVE_FENCE_SYNC for msm8960" into jb-mr1-dev 2012-09-18 20:28:04 -07:00
Jeff Boody
42223f6fdd gui: conditionally set USE_NATIVE_FENCE_SYNC for msm8960 
Change-Id: Ib7ad11597ef7c79162a0b0a49a1b8ae16d192c10
Signed-off-by: Iliyan Malchev <malchev@google.com>
 2012-09-18 19:36:12 -07:00
Mathias Agopian
a5b8e8bfa9 fix a typo in SensorService 
It shouldn't have caused much harm though.
Also log a warning when enabling a sensor
for a connection that is already enabled.

Change-Id: Ia4a052381e79183cd4cb1bedc7ba08e5228d7a38
 2012-09-18 17:19:04 -07:00
Mathias Agopian
3edb495060 am 1d12d8a8: improve logging of external displays 
* commit '1d12d8a8e61163b35cf42c51c558a67138014e82':
  improve logging of external displays
 2012-09-18 15:14:34 -07:00
Mathias Agopian
1d12d8a8e6 improve logging of external displays 
Change-Id: I041aebb7fc655aeca98bbf698d15e05d7c12cac9
 2012-09-18 14:42:32 -07:00
Jesse Hall
ef27e9cea0 Check that HWC exists before trying to use it 
Bug: 7185810
Change-Id: I1271d6ba397f3abf0ef166b8d03b9b26b72e28d7
 2012-09-18 14:28:25 -07:00
Mathias Agopian
157bb2c1d9 am 6ab93290: suppress superfluous log 
* commit '6ab93290aeed63f139b0e77819ea889bbce9ec8b':
  suppress superfluous log
 2012-09-18 13:23:56 -07:00
Mathias Agopian
6ab93290ae suppress superfluous log 
Change-Id: I838f2de4cf99e885833c4f42e2a69d6e3bb8eea5
 2012-09-18 13:19:46 -07:00
Jesse Hall
c7e4e27fd4 am aeb76d16: Merge "Check that HWC exists before trying to use it" into jb-mr1-dev 
* commit 'aeb76d160c530786d58d6a8b35d9b4a75a2279e3':
  Check that HWC exists before trying to use it
 2012-09-18 12:21:45 -07:00
Jesse Hall
aeb76d160c Merge "Check that HWC exists before trying to use it" into jb-mr1-dev 2012-09-18 12:16:14 -07:00
Jamie Gennis
21fc3a0560 am 3941cb24: SurfaceTexture: default to doing GL sync 
* commit '3941cb240d438bfdebe24920bb2ada86456a0bf9':
  SurfaceTexture: default to doing GL sync
 2012-09-18 12:14:51 -07:00
Jesse Hall
d3d35f1834 Check that HWC exists before trying to use it 
Bug: 7185810
Change-Id: I1271d6ba397f3abf0ef166b8d03b9b26b72e28d7
 2012-09-18 11:39:40 -07:00
Jamie Gennis
3941cb240d SurfaceTexture: default to doing GL sync 
This change makes updateTexImage default to performing the necessary
synchronization and adds an argument for SurfaceFlinger to disable that
synchronization so that it can be performed lazily.

Change-Id: I7c20923cc786634126fbf7021c9d2541aa77be5d
Bug: 6991805
 2012-09-18 10:59:40 -07:00
Andy McFadden
721b2a2815 am 8dfa92fe: Plumb display name into SurfaceFlinger 
* commit '8dfa92fef9759a881e96ee58d59875d35023aab9':
  Plumb display name into SurfaceFlinger
 2012-09-18 10:10:14 -07:00
Andy McFadden
8dfa92fef9 Plumb display name into SurfaceFlinger 
The Surface createDisplay() call takes a display name for debugging.
This change carries it through SurfaceFlinger and displays it in
the "dumpsys SurfaceFlinger" output.

Bug 7058158

Change-Id: I79f3474a8656ff1beb7b478e0dbf2c5de666118a
 2012-09-18 09:20:23 -07:00
The Android Automerger
336768a935 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-09-18 06:59:48 -07:00
Mathias Agopian
e303e43140 am d870703d: fix external displays 
* commit 'd870703d5566490cfdfb389d9336b2b8d3c6cc7a':
  fix external displays
 2012-09-18 02:32:47 -07:00
Mathias Agopian
d870703d55 fix external displays 
we were not calling eglSwapBuffers() on external displays
because they can't use HWC which caused us to think they
didn't have GLES composition.

Change-Id: I6cef4ae40b138412d2e6f2acda33c9d222b03a83
 2012-09-18 01:21:55 -07:00
Mathias Agopian
cb54b2a42c am 41cb1b5f: Merge changes I53d70510,If34a05f3 into jb-mr1-dev 
* commit '41cb1b5f673b7f73e7f781b9f51ed095085dfdcd':
  add support hwc 1.1
  refactor things a bit
 2012-09-18 00:04:32 -07:00
Jamie Gennis
8e7e539976 am f0f56f32: Merge "EGL: fix an extension string bug" into jb-mr1-dev 
* commit 'f0f56f32bba418ebb42381cd63ba5da36f6fa228':
  EGL: fix an extension string bug
 2012-09-18 00:04:24 -07:00
Mathias Agopian
41cb1b5f67 Merge changes I53d70510,If34a05f3 into jb-mr1-dev 
* changes:
  add support hwc 1.1
  refactor things a bit
 2012-09-17 18:59:04 -07:00
Mathias Agopian
da27af9832 add support hwc 1.1 
Bug: 7124069

Change-Id: I53d705105c4ad8954d3f50ee4f4c8b7ec936b871
 2012-09-17 18:57:53 -07:00
Jamie Gennis
f0f56f32bb Merge "EGL: fix an extension string bug" into jb-mr1-dev 2012-09-17 18:51:55 -07:00
Jamie Gennis
a08cf6e3a4 EGL: fix an extension string bug 
This change fixes a bug where initializing EGL multiple times (eglTerminate
followed by eglInitialize) would cause extensions to show up in the extension
string multiple times.

Change-Id: I707a3da62ed30ef13835087167f84a08bc6addd7
 2012-09-17 17:23:29 -07:00
Mathias Agopian
cde87a3b9d refactor things a bit 
- decouple GL and main display initialization
- ensure that each "supported" display has its own FramebufferSurface
- onScreenAcquired/Released now takes a display

Change-Id: If34a05f3dea40f6c79db77f4dde283a2580daac4
 2012-09-17 12:37:10 -07:00
Elliott Hughes
001d3c28af am c8cff90d: Merge "Use a named constant rather than a magic number." into jb-mr1-dev 
* commit 'c8cff90d49b6eeaf0290c16517ff49df185dbdcd':
  Use a named constant rather than a magic number.
 2012-09-17 12:13:28 -07:00
Elliott Hughes
c8cff90d49 Merge "Use a named constant rather than a magic number." into jb-mr1-dev 2012-09-17 12:11:25 -07:00
Elliott Hughes
5f87b31d80 Use a named constant rather than a magic number. 
Change-Id: I86e8c91c6f5628df3eec38faf28598cc8cef2ea3
 2012-09-17 11:43:40 -07:00
jp abgrall
41fc5a4882 am 86ca50d8: am e917bfbd: am 09a22fc2: Merge "Allow disable of dumpstate vibrate" 
* commit '86ca50d860fa256f5553ac7b313ba5ff0f120ef0':
  Allow disable of dumpstate vibrate
 2012-09-17 11:03:29 -07:00
jp abgrall
86ca50d860 am e917bfbd: am 09a22fc2: Merge "Allow disable of dumpstate vibrate" 
* commit 'e917bfbd19c265ef09c90f93f5dc175fc62259f5':
  Allow disable of dumpstate vibrate
 2012-09-17 11:01:37 -07:00
jp abgrall
e917bfbd19 am 09a22fc2: Merge "Allow disable of dumpstate vibrate" 
* commit '09a22fc29d588b173e5c0dd2002ac2c44d45b7c6':
  Allow disable of dumpstate vibrate
 2012-09-17 10:58:38 -07:00
jp abgrall
09a22fc29d Merge "Allow disable of dumpstate vibrate" 2012-09-17 10:21:31 -07:00
John Michelau
1f794c442c Allow disable of dumpstate vibrate 
Change-Id: I747b757f4b5e2d6a472b7b2a19f8c1ca8a4b7fdd
 2012-09-17 11:20:19 -05:00
The Android Automerger
eb1844f8ea merge in jb-mr1-release history after reset to jb-mr1-dev 2012-09-16 17:12:24 -07:00
Ben Cheng
149627d136 am 07e8134e: Merge "Print warnings when backwards timestamps are detected." into jb-mr1-dev 
* commit '07e8134e24e9ef7a3b2ade361ead5ce1b514c72f':
  Print warnings when backwards timestamps are detected.
 2012-09-16 16:25:21 -07:00
Ben Cheng
07e8134e24 Merge "Print warnings when backwards timestamps are detected." into jb-mr1-dev 2012-09-16 16:24:29 -07:00
Ben Cheng
8dc7c6e659 Print warnings when backwards timestamps are detected. 
Bug: 7100774

Change-Id: I752fd1680b32ce33d17d6042d6c82e27d7ba9dd2
 2012-09-16 16:21:01 -07:00
Andy McFadden
cc29e530cf am 71f683ac: New test 
* commit '71f683ac8d28e93928a9bb1744f43264b4846e8f':
  New test
 2012-09-16 13:28:48 -07:00
Andy McFadden
1d84178faf am 6905205c: Fix transform hints 
* commit '6905205c8d130b6ea3a813c1b9283492ed183367':
  Fix transform hints
 2012-09-16 12:54:28 -07:00