ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues 7 Pull Requests Releases Wiki Activity
49,607 Commits 2 Branches 0 Tags 54 MiB
0487281e3c
Commit Graph

49607 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Narayan Kamath
a9d5701b03 AssetManager cookies should be int32_t and not void*. 
Cookies are really indices into vectors and arrays, so
they don't need to be void*. We choose int32_t instead
of size_t to allow their width to be well specified.

Change-Id: I319f271bd4f102dee7cb9f00df4c75ea697456f5
 2014-01-27 11:11:50 +00:00
Jesse Hall
467113c6fc am 25f75c36: am 8c303f7e: am fcf9c1ba: Merge "SurfaceFlinger: mFbFence initialization" 
* commit '25f75c361098086ffa2b87dcc3f22ac5f64c05be':
  SurfaceFlinger: mFbFence initialization
 2014-01-26 16:50:36 +00:00
Jesse Hall
25f75c3610 am 8c303f7e: am fcf9c1ba: Merge "SurfaceFlinger: mFbFence initialization" 
* commit '8c303f7e64b3de7748922e6f951d9e82bc96badd':
  SurfaceFlinger: mFbFence initialization
 2014-01-26 16:47:45 +00:00
Jesse Hall
8c303f7e64 am fcf9c1ba: Merge "SurfaceFlinger: mFbFence initialization" 
* commit 'fcf9c1bafb251c186191b9d066ed00d0b59b962a':
  SurfaceFlinger: mFbFence initialization
 2014-01-26 08:45:40 -08:00
Jesse Hall
fcf9c1bafb Merge "SurfaceFlinger: mFbFence initialization" 2014-01-26 08:15:15 +00:00
mayank parshar
b988f85fc4 SurfaceFlinger: mFbFence initialization 
MobC00383030
b/12487813

SurfaceFlinger crash is observed while connecting
to Wi-Fi display.

Note: change 14e8b01a76
removed the initialization leading to the crash when
running through the HWC composition path.  Restore the
initialization to solve the problem.

Change-Id: I581defc7135ac512080c0da06a62b1dae7d218c4
Signed-off-by: mayank parshar <mayankp@broadcom.com>
Signed-off-by: Pierre Couillaud <pierre@broadcom.com>
 2014-01-25 06:35:24 -08:00
Colin Cross
8b7cc0aeb7 am dd000905: am e3aeefd1: am af29b77a: Merge "libGLES_android: fix 64-bit compile errors" 
* commit 'dd00090530340de22ca60f79446b5fe3050cd95f':
  libGLES_android: fix 64-bit compile errors
 2014-01-25 00:50:21 +00:00
Colin Cross
dd00090530 am e3aeefd1: am af29b77a: Merge "libGLES_android: fix 64-bit compile errors" 
* commit 'e3aeefd1f8a5ac0e4b2106fc1cf190ad4f75078c':
  libGLES_android: fix 64-bit compile errors
 2014-01-25 00:44:54 +00:00
Colin Cross
e3aeefd1f8 am af29b77a: Merge "libGLES_android: fix 64-bit compile errors" 
* commit 'af29b77ab7dab5a1b5af27e7f7eeeb14584c101c':
  libGLES_android: fix 64-bit compile errors
 2014-01-24 16:42:36 -08:00
Colin Cross
af29b77ab7 Merge "libGLES_android: fix 64-bit compile errors" 2014-01-25 00:38:16 +00:00
Colin Cross
444839b842 libGLES_android: fix 64-bit compile errors 
Fix size of vertex_t on 64-bit architectures
Fix __get_tls casts, the TLS area is a void**
Cast through uintptr_t to store integers in a pointer
Use %zu to print size_t

Change-Id: I91079ec76025237e6d2081784c5348518b0ce122
 2014-01-24 14:44:57 -08:00
Dan Stoza
c3289c41e7 Make libEGL build cleanly under 64-bit 
Change-Id: I255dfb70b166b7469d59352b1acfc7aececa07de
 2014-01-17 15:32:27 -08:00
Guang Zhu
9fcca4ee17 releax wait timeout on start of dumpstate service 
Bug: 12181612
Change-Id: If7ae97de1e42890dac37d036ead669ccda65e688
 2014-01-15 15:58:54 -08:00
Dan Stoza
9ef78fe272 Merge "libgui: Add a test for SRGB surfaces" 2014-01-08 17:48:13 +00:00
Dan Stoza
6a5d35dd5c libgui: Add a test for SRGB surfaces 
Add SRGBTest.RenderToSRGBSurface, which validates that passing the
SRGB colorspace attributes to eglCreateWindowSurface actually
results in an SRGB surface by comparing the output values to those
of a standard RGB surface.

Change-Id: I3d5fef8070ed8fa2357ddd1c5fcc849ae3fbd12a
 2014-01-07 16:43:39 -08:00
Andy McFadden
d566ce3a26 Improve error message 
The previous message indicated that the fault was due to an already-
connected window, which was misleading at times.

Bug 12439318

Change-Id: I1e0a042673dd245d1b0d237af963c52946803eb6
 2014-01-07 15:54:17 -08:00
Jesse Hall
524672571f am 03691218: am e5f7bf74: am b6c21004: Merge "Implement per-display EGLConfig and configless EGLContext" 
* commit '03691218ada2fb7e084ad4ae7ddd54f9b28d5611':
  Implement per-display EGLConfig and configless EGLContext
 2014-01-03 18:36:29 +00:00
Jesse Hall
10ca42cbdc am 4c37d088: am 6c7dcfa9: am 662d3134: Merge "Move EGLConfig selection to RenderEngine" 
* commit '4c37d0886ca06c290e205cad2798406361bbbf53':
  Move EGLConfig selection to RenderEngine
 2014-01-03 18:36:28 +00:00
Jesse Hall
03691218ad am e5f7bf74: am b6c21004: Merge "Implement per-display EGLConfig and configless EGLContext" 
* commit 'e5f7bf7471b21226c9a6b875e9e8f2fb2cba72e2':
  Implement per-display EGLConfig and configless EGLContext
 2014-01-03 18:31:54 +00:00
Jesse Hall
4c37d0886c am 6c7dcfa9: am 662d3134: Merge "Move EGLConfig selection to RenderEngine" 
* commit '6c7dcfa956847a9f061fd1b2baa9dc43585599af':
  Move EGLConfig selection to RenderEngine
 2014-01-03 18:31:53 +00:00
Jesse Hall
e5f7bf7471 am b6c21004: Merge "Implement per-display EGLConfig and configless EGLContext" 
* commit 'b6c2100458bd4dda880ec24dc7d1f39825d5243d':
  Implement per-display EGLConfig and configless EGLContext
 2014-01-03 10:30:11 -08:00
Jesse Hall
6c7dcfa956 am 662d3134: Merge "Move EGLConfig selection to RenderEngine" 
* commit '662d3134cb3fe3f18a0a6bfbc24368c2291c8e19':
  Move EGLConfig selection to RenderEngine
 2014-01-03 10:30:10 -08:00
Jesse Hall
b6c2100458 Merge "Implement per-display EGLConfig and configless EGLContext" 2014-01-03 18:25:07 +00:00
Jesse Hall
662d3134cb Merge "Move EGLConfig selection to RenderEngine" 2014-01-03 18:24:30 +00:00
Jesse Hall
19e872912a Implement per-display EGLConfig and configless EGLContext 
Bug: 12230666
Change-Id: Icca608b108cbdcab9cf01a9236d8cdbda000a836
Signed-off-by: Jesse Hall <jessehall@google.com>
 2013-12-23 21:53:39 -08:00
Jesse Hall
05f8c703d4 Move EGLConfig selection to RenderEngine 
Bug: 12230666
Change-Id: I8d1111a7e0fd9d9e2525e6a80da8ce46d7dd085d
Signed-off-by: Jesse Hall <jessehall@google.com>
 2013-12-23 21:53:39 -08:00
RoboErik
95c6675db1 Merge "b/12068020 add nonce to InputDeviceDescriptor" 2013-12-19 21:15:05 +00:00
RoboErik
ec2a15a26f b/12068020 add nonce to InputDeviceDescriptor 
Adds a nonce field to allow generation of unique descriptors for
input devices.

Change-Id: I978b6c5e9edc9e0a6aa60f85cd8d4efc42ac2999
 2013-12-19 11:54:29 -08:00
Brian Carlstrom
494600a755 am 285bfefb: am c1bf6fa9: am 7fea2361: Merge "Track Looper decoupling from ALooper" 
* commit '285bfefb01f24e98348628c115eb6c524417ea82':
  Track Looper decoupling from ALooper
 2013-12-19 07:58:30 +00:00
Brian Carlstrom
285bfefb01 am c1bf6fa9: am 7fea2361: Merge "Track Looper decoupling from ALooper" 
* commit 'c1bf6fa9495b21f25e7ab1a491b918df71be6e1a':
  Track Looper decoupling from ALooper
 2013-12-19 07:25:24 +00:00
Brian Carlstrom
c1bf6fa949 am 7fea2361: Merge "Track Looper decoupling from ALooper" 
* commit '7fea23613a8bcfae2d6f13234c3f0d7c9c3ef570':
  Track Looper decoupling from ALooper
 2013-12-18 23:21:51 -08:00
Brian Carlstrom
7fea23613a Merge "Track Looper decoupling from ALooper" 2013-12-19 07:13:03 +00:00
Nick Kralevich
b281d81404 am e2d412f0: am e7394ba8: am c02c35fb: Merge "restorecon /data/media when re-creating it for multi-user upgrade." 
* commit 'e2d412f0466ac6a1a33e2c2563ed2192b58bfa87':
  restorecon /data/media when re-creating it for multi-user upgrade.
 2013-12-17 23:18:58 +00:00
Nick Kralevich
e2d412f046 am e7394ba8: am c02c35fb: Merge "restorecon /data/media when re-creating it for multi-user upgrade." 
* commit 'e7394ba8bd9cd90a0fb72f6c50522a41cd7877fd':
  restorecon /data/media when re-creating it for multi-user upgrade.
 2013-12-17 23:12:20 +00:00
Nick Kralevich
e7394ba8bd am c02c35fb: Merge "restorecon /data/media when re-creating it for multi-user upgrade." 
* commit 'c02c35fbdc90acbb6483fddd9a8822a16a63689d':
  restorecon /data/media when re-creating it for multi-user upgrade.
 2013-12-17 15:08:30 -08:00
Nick Kralevich
c02c35fbdc Merge "restorecon /data/media when re-creating it for multi-user upgrade." 2013-12-17 23:02:36 +00:00
Stephen Smalley
47a351834f restorecon /data/media when re-creating it for multi-user upgrade. 
Change-Id: I112c61863f2104d1962697c54cff25106e9b48a0
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
 2013-12-17 16:04:20 -05:00
Christopher Tate
6fce2d2280 Fix MCC/MNC typo 
Manual merge of https://android-review.googlesource.com/70831 across
the header refactoring.

Change-Id: I28b6a61e89b68d914124122882976a9d2f81a609
 2013-12-16 15:04:10 -08:00
Brian Carlstrom
fe761ab6c7 Track Looper decoupling from ALooper 
Change-Id: I612f0de7002e24948a4cbbea7b416b4fbb3929aa
 2013-12-12 23:54:43 -08:00
Dan Stoza
3ed4e0b365 libgui: Add a test suite for SRGB testing 
This is the start of an SRGB test suite. Currently it has a test for
SRGB texture reads in GLES3.

Change-Id: I553ee2691dc92b98cae7a003084d4e2823d40d95
 2013-12-12 10:58:56 -08:00
Narayan Kamath
ec3994f2b3 Merge changes I25acff1d,Iae67e62f 
* changes:
  Add libutils dependency for libandroidfw host build.
  Reimplement ZipFileRO in terms of libziparchive.
 2013-12-11 19:35:53 +00:00
Narayan Kamath
ce12e8c318 Add libutils dependency for libandroidfw host build. 
(cherry picked from commit 070274ec0ccb8643c52e41e4119f356f0f51bc36)

Change-Id: I25acff1d36b3adce14b2576485bda93c914d7f5d
 2013-12-11 19:16:11 +00:00
Todd Poynor
34ced636fb am 2a83daa8: dumpstate: dump console-ramoops instead of last_kmsg if present 
* commit '2a83daa8a3e1eab292dc1464bbe78f025f4bc0e9':
  dumpstate: dump console-ramoops instead of last_kmsg if present
 2013-12-11 06:30:39 +00:00
Todd Poynor
2a83daa8a3 dumpstate: dump console-ramoops instead of last_kmsg if present 
Change-Id: I41a922b33f0b6b4e8e150a92e46032501a165e33
 2013-12-10 14:42:27 -08:00
Aravind Akella
0075d781b4 Merge "Bug fix for SensorFusion data rate." 2013-12-10 20:12:29 +00:00
Aravind Akella
8850909038 Bug fix for SensorFusion data rate. 
SensorFusion is always returning data at the slowest possible sampling rate (5 Hz). batch() is getting called twice, first time with the requested rate and second time with the slowest rate (which overwrites the requested rate). Fix batch call in SensorFusion::activate()

Bug: 12064319
Change-Id: If62f3e514233f69810336fd22b136b4395b667d3
 2013-12-10 01:57:12 +00:00
Dan Stoza
a6c2591791 Merge "libgui: Split SurfaceTexture tests into more files" 2013-12-09 18:38:51 +00:00
Dan Stoza
cb1fcdedaa libgui: Split SurfaceTexture tests into more files 
Extract the many different test fixtures and suites in SurfaceTexture_test.cpp
into separate files. No real functional changes, just tweaking headers to keep
things building (and adding a few copyright headers I forgot last time).

Change-Id: Id801bd5d617f0cc61d22508fb9b71b41694bdecf
 2013-12-09 09:52:02 -08:00
Narayan Kamath
aae73e748c Reimplement ZipFileRO in terms of libziparchive. 
This lets us share zip archive processing code with both
the runtime (Art, dalvik) and critical java code
(StrictJarFile).

This change also moves several utility methods to ZipUtils
and dedups code across several zip inflation methods.

One of the side effects of this change is that several
processing loops are now O(n) instead of O(n^2).

bug: 10193060

(cherry picked from commit afd31e08299008fdc5c2813f21b2573f29dc53df)

Change-Id: Iae67e62f1dc6dfc3f43e29bc38e3ffd1cb14d191
 2013-12-09 16:34:30 +00:00
The Android Open Source Project
d837548947 am 1b5143bf: am de8c8069: Merge commit \'1ee45c2d2d816ee912624d81ff1b0aaa98e8fa74\' into HEAD 
* commit '1b5143bfd6ae69ca37ee78e77bd1fcad78c105bd':
 2013-12-06 01:43:29 +00:00