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

49662 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andy McFadden
382f1cc1f1 Merge "Hide three malformed GL bindings" 2014-02-19 19:15:20 +00:00
Andy McFadden
50166d1173 Hide three malformed GL bindings 
They were replaced with correct bindings a while back, but the
broken methods weren't hidden.

Also, pick up two changes that were made to the generated code
rather than the source.

Bug 6006380

Change-Id: Ibfe9a5f2e13e745f8d82116d1b4d8c2d025ac830
 2014-02-19 10:27:24 -08:00
Andy McFadden
35571a41b3 am 22a5c8b2: (-s ours) am 44c35ec4: Allow "opaque" flag to be updated. DO NOT MERGE 
* commit '22a5c8b2e3c232a7cbe452759f20fc3c8382add7':
  Allow "opaque" flag to be updated. DO NOT MERGE
 2014-02-19 00:05:51 +00:00
Andy McFadden
22a5c8b2e3 am 44c35ec4: Allow "opaque" flag to be updated. DO NOT MERGE 
* commit '44c35ec4a94eb33f7ee0df085c5d2d56d99962cf':
  Allow "opaque" flag to be updated. DO NOT MERGE
 2014-02-18 23:59:43 +00:00
Andy McFadden
44c35ec4a9 Allow "opaque" flag to be updated. DO NOT MERGE 
Moves the "opaque layer" from Layer to Layer::State.  This allows
it to be updated as part of a transaction.

Bug 12387406

Change-Id: I0a114ce6adf77cd12fb08f96e0691b76c475768d
 2014-02-18 15:55:42 -08:00
Colin Cross
0380d5279b am 7a66f7af: am 913a17fd: Merge "libagl: support multilib build" 
* commit '7a66f7afd1b6a975ab3b99b4765781a0d66958c8':
  libagl: support multilib build
 2014-02-18 21:39:56 +00:00
Colin Cross
7a66f7afd1 am 913a17fd: Merge "libagl: support multilib build" 
* commit '913a17fd5f8cabbc73ff46db15b4b53b9aeba7b8':
  libagl: support multilib build
 2014-02-18 21:35:25 +00:00
Colin Cross
913a17fd5f Merge "libagl: support multilib build" 2014-02-18 21:29:50 +00:00
Colin Cross
505350b150 am 8a9a2e24: am d5fe844b: Merge "Use /(vendor|system)/lib64/egl for 64-bit EGL libraries" 
* commit '8a9a2e24db868fba404049d700ae704b0982e5f3':
  Use /(vendor|system)/lib64/egl for 64-bit EGL libraries
 2014-02-18 20:25:54 +00:00
Colin Cross
8a9a2e24db am d5fe844b: Merge "Use /(vendor|system)/lib64/egl for 64-bit EGL libraries" 
* commit 'd5fe844b41778bf87101fc0a0e4e37e779678c50':
  Use /(vendor|system)/lib64/egl for 64-bit EGL libraries
 2014-02-18 20:21:35 +00:00
Colin Cross
d5fe844b41 Merge "Use /(vendor|system)/lib64/egl for 64-bit EGL libraries" 2014-02-18 20:14:41 +00:00
Dan Willemsen
8edb8f5f2d Use /(vendor|system)/lib64/egl for 64-bit EGL libraries 
Change-Id: Ie64806bfe4ba60a3167b84685cf983d4ada1042d
 2014-02-16 10:29:40 -08:00
Colin Cross
ff75a8000c libagl: support multilib build 
Use LOCAL_SRC_FILES_arch and LOCAL_CFLAGS_arch to support building
for multiple architectures.

Change-Id: I829c1bea880739bf8184df4006d0a481ffccc5c2
 2014-02-14 17:29:22 -08:00
Dianne Hackborn
20c7adbfaa am b37b312b: am 7d86b454: Merge "frameworks/native: move idmap to frameworks/base" 
* commit 'b37b312b829c7ab5107c2f96d0a95a557f67a831':
  frameworks/native: move idmap to frameworks/base
 2014-02-14 02:00:17 +00:00
Dianne Hackborn
b37b312b82 am 7d86b454: Merge "frameworks/native: move idmap to frameworks/base" 
* commit '7d86b45472898373bbe3ef03286b66d71ea82b79':
  frameworks/native: move idmap to frameworks/base
 2014-02-14 01:54:37 +00:00
Dianne Hackborn
7d86b45472 Merge "frameworks/native: move idmap to frameworks/base" 2014-02-14 01:45:28 +00:00
Nick Kralevich
165c8bdfb5 am 0e4d2885: am 2044ac43: Merge "Convert all selinux_android_restorecon and _setfilecon calls to new API." 
* commit '0e4d2885a34d31f5dbe5a08bdb654953abaf82a2':
  Convert all selinux_android_restorecon and _setfilecon calls to new API.
 2014-02-13 00:16:04 +00:00
Nick Kralevich
0e4d2885a3 am 2044ac43: Merge "Convert all selinux_android_restorecon and _setfilecon calls to new API." 
* commit '2044ac43e53b517526b3c70dc4fbc60ffc01693f':
  Convert all selinux_android_restorecon and _setfilecon calls to new API.
 2014-02-12 23:15:07 +00:00
Nick Kralevich
2044ac43e5 Merge "Convert all selinux_android_restorecon and _setfilecon calls to new API." 2014-02-12 23:09:45 +00:00
Colin Cross
07a4728150 frameworks/native: move idmap to frameworks/base 
idmap depends on libandroidfw, so it should go in frameworks/base.

Change-Id: Ieee30ba9d8170d3118acc89f0617981228a6974b
 2014-02-11 18:04:03 -08:00
Jeff Brown
87c01edaf6 Merge "Add support for injecting events into ActivityContainers." 2014-02-12 00:35:43 +00:00
Jeff Brown
96e495bda3 am eac45b8a: (-s ours) am ed4d28dd: Add method to apply offset to PointerCoords. (DO NOT MERGE) 
* commit 'eac45b8a53e8a17b6c9a1e7bb69a8a791073c007':
  Add method to apply offset to PointerCoords.  (DO NOT MERGE)
 2014-02-12 00:31:55 +00:00
Jeff Brown
eac45b8a53 am ed4d28dd: Add method to apply offset to PointerCoords. (DO NOT MERGE) 
* commit 'ed4d28dd70448b13eb74a3166ec8d1c1a530e2d4':
  Add method to apply offset to PointerCoords.  (DO NOT MERGE)
 2014-02-12 00:26:19 +00:00
Jeff Brown
f086ddbb97 Add support for injecting events into ActivityContainers. 
Enhanced the input system to support concurrent dispatch of touch
events on multiple displays which is required for this to work.

Add method to apply offset to PointerCoords.

Change-Id: I55fe4a9a8785ae5a2d3341d214fa3c5107f3963a
 2014-02-11 14:51:24 -08:00
Jeff Brown
ed4d28dd70 Add method to apply offset to PointerCoords. (DO NOT MERGE) 
Change-Id: I3dc2ba22b026e5b8e1c3d90f7366ec09a59ce6b6
 2014-02-11 14:43:19 -08:00
Dianne Hackborn
297097957f am 6e5fdb15: am 6c14f0ad: Merge "Runtime resource overlay, iteration 2" 
* commit '6e5fdb1551ca7d117bf7e1acca133a077a8701f0':
  Runtime resource overlay, iteration 2
 2014-02-11 21:49:02 +00:00
Dianne Hackborn
6e5fdb1551 am 6c14f0ad: Merge "Runtime resource overlay, iteration 2" 
* commit '6c14f0ad82be418c742e56fe586657ea0f394b05':
  Runtime resource overlay, iteration 2
 2014-02-11 21:41:23 +00:00
Dianne Hackborn
6c14f0ad82 Merge "Runtime resource overlay, iteration 2" 2014-02-11 21:27:36 +00:00
Dianne Hackborn
667c3a19d8 am 99188064: am 340aa8cb: Merge "New command line tool \'idmap\'" 
* commit '99188064fd3b2d4ca85b02afefa4adb2562f8940':
  New command line tool 'idmap'
 2014-02-11 20:41:09 +00:00
Dianne Hackborn
99188064fd am 340aa8cb: Merge "New command line tool \'idmap\'" 
* commit '340aa8cbd4afbb68b16f369336cc1c202582f021':
  New command line tool 'idmap'
 2014-02-11 20:35:42 +00:00
Dianne Hackborn
340aa8cbd4 Merge "New command line tool 'idmap'" 2014-02-11 20:29:56 +00:00
Michael Wright
d02c5b6aac Move inputservice over to frameworks/native 
Add all of the underlying input system pieces, minux PointerController and
SpriteController, to inputflinger. This is in preparation for moving input to
its own process and the addition of the input HAL.

Try 2.

Change-Id: I5f571fe86eb570885ae994e1f0552fb558930346
 2014-02-11 10:47:14 -08:00
Michael Wright
1b1fe314c4 Revert "Move inputservice over to frameworks/native" 
This reverts commit 2dceb67f1f.
 2014-02-10 15:08:18 -08:00
Michael Wright
2dceb67f1f Move inputservice over to frameworks/native 
Add all of the underlying input system pieces, minux PointerController and
SpriteController, to inputflinger. This is in preparation for moving input to
its own process and the addition of the input HAL.

Change-Id: I1419a740b38756bd0d54fef5f5ca337e6815b1b0
 2014-02-10 14:12:49 -08:00
Michael Wright
1c284a9431 Add contains point method to Region 
Change-Id: I553433ff7ac39f14ffca8278960d2abc95b4dd63
 2014-02-10 13:00:14 -08:00
Stephen Smalley
26288202e7 Convert all selinux_android_restorecon and _setfilecon calls to new API. 
libselinux selinux_android_restorecon API is changing to the more
general interface with flags and dropping the older variants.

Also get rid of the old, no longer used selinux_android_setfilecon API
and rename selinux_android_setfilecon2 to it as it is the only API in use.

Change-Id: I1e71ec398ccdc24cac4ec76f1b858d0f680f4925
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
 2014-02-07 09:36:11 -05:00
Adam Lesinski
835f5df6cc am 1772970f: am 0f0ccf07: Add new software features 
* commit '1772970fa510b915d7b0006093933278db57f899':
  Add new software features
 2014-02-06 19:36:37 +00:00
Adam Lesinski
1772970fa5 am 0f0ccf07: Add new software features 
* commit '0f0ccf07bad594b618f4fcce9a8f79a5bc188bb3':
  Add new software features
 2014-02-06 19:30:54 +00:00
Colin Cross
4ba492f23b am 2b957503: am 74be0f7b: Merge "binder: fix all warnings" 
* commit '2b957503b77c938e0698ffa8904e20c38c408d81':
  binder: fix all warnings
 2014-02-06 03:07:47 +00:00
Colin Cross
2b957503b7 am 74be0f7b: Merge "binder: fix all warnings" 
* commit '74be0f7be35e7b40a322fa9a407cb49265333a0b':
  binder: fix all warnings
 2014-02-06 02:59:37 +00:00
Colin Cross
74be0f7be3 Merge "binder: fix all warnings" 2014-02-06 02:06:42 +00:00
Colin Cross
6f4f3ab36c binder: fix all warnings 
Fix warnings related to casting pointers to ints, using %d or %ld to
print size_t/ssize_t, and unused parameters.

Change-Id: I7a13ba83d402952989c1f795cd9e880a95b98d9e
 2014-02-05 17:51:10 -08:00
Adam Lesinski
0f0ccf07ba Add new software features 
Wearable devices are much more stripped down than
handheld and tablet devices. There are system
services that must not be present on wearable
devices. Those services have their own feature
xml files that get copied to the system image
as needed. They are included by default in the
handheld and tablet core feature files in order
to maintain previous behavior.

Wearable devices should always copy the
data/etc/wearable_core_hardware.xml file and
whatever other files that represent required
services (eg. data/etc/android.software.print.xml).

Change-Id: I410442d45854fe54cba1131ce488a5a459ac580a
 2014-02-05 19:35:57 +00:00
Dan Stoza
86e7690ec2 Merge "Fix virtual display nesting" 2014-02-05 18:55:11 +00:00
Andrew Hsieh
532cbb0fdc am bdab63e0: am 055dac1b: Merge "Fixed apparent copy/paste mistake Bug: 11634373" 
* commit 'bdab63e06b6bacb60991420891cb06fe3dc5654f':
  Fixed apparent copy/paste mistake Bug: 11634373
 2014-02-05 08:06:22 +00:00
Andrew Hsieh
bdab63e06b am 055dac1b: Merge "Fixed apparent copy/paste mistake Bug: 11634373" 
* commit '055dac1b54af46a0608b32e83fcae45e75a4a8f0':
  Fixed apparent copy/paste mistake Bug: 11634373
 2014-02-05 07:58:00 +00:00
Andrew Hsieh
055dac1b54 Merge "Fixed apparent copy/paste mistake Bug: 11634373" 2014-02-05 07:16:31 +00:00
David Friedman
8769436bba Fixed apparent copy/paste mistake 
Bug: 11634373

Change-Id: I9b0ac4d3b4a9a2999b2013abd39465a062ec51ea
 2014-02-05 11:19:04 +08:00
Dan Stoza
7143316af2 Fix virtual display nesting 
This fixes the cycling rendering loop caused by nesting virtual
displays by preventing them from recomposing if their contents
haven't changed.

Bug: 12101046
Change-Id: I600365c0fd5d3ad93e04295d26cf9de177ffc79b
 2014-02-04 16:46:54 -08:00
Siva Velusamy
1d41d5d82c am 67041e68: am fd6a3ff4: Merge "GLES_trace: fix compile errors on 64 bit architectures" 
* commit '67041e6841d89efb0dbaf4562b601b80be61e1e6':
  GLES_trace: fix compile errors on 64 bit architectures
 2014-02-04 19:25:21 +00:00