ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
50,433 Commits 2 Branches 0 Tags 54 MiB
8f515ce1c5
Commit Graph

50433 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jesse Hall
bbbddb83bb Disable warnings when generating GL wrappers 
Bug: 15028495
Change-Id: Ic0c974e868d05632a06748c90cedbdd409ce2aa8
 2014-05-17 19:32:10 -07:00
Jesse Hall
4c0596f4cc Rationalize GLES2/3 .in files. 
We weren't using gl2_api.in, since gl3_api.in was a superset. And
gl3ext_api.in was empty, and Khronos has decided to keep it that way
(any GLES2/3/... extensions will be in gl2ext.h).

Since libGLES2.so will have all future backwards-compatible GLES APIs,
it makes sense to just use gl2_api.in and gl2ext_api.in to build its
contents. This changes renames gl3_api.in to gl2_api.in and updates
uses of it, and removes gl3ext_api.in and references.

Bug: 15028495
Change-Id: I0745eda27ec91ee625f03e957e4fdb22035dd781
 2014-05-17 19:31:48 -07:00
The Android Automerger
3b7cb1ffc2 merge in master-release history after reset to 6b4e02f1cb 2014-05-17 05:51:01 -07:00
Tim Kilbourn
6b4e02f1cb Add KEYCODE_PAIRING. 
Used for initiating a peripheral pairing mode.

Change-Id: I7e8439d27491ccc72d045cabf5751a35b9113aa7
 2014-05-16 15:36:11 -07:00
Narayan Kamath
d924ee8b03 am f8c66b4b: am cfba3bf1: am c9fcaf37: Merge "Change InputMessage.motion.pointerSize to a uint32_t." 
* commit 'f8c66b4bee9ab0203b83ea3a6df8f49fad443d88':
  Change InputMessage.motion.pointerSize to a uint32_t.
 2014-05-16 12:13:39 +00:00
Narayan Kamath
f8c66b4bee am cfba3bf1: am c9fcaf37: Merge "Change InputMessage.motion.pointerSize to a uint32_t." 
* commit 'cfba3bf1606dfdb1daf1be1c19176180660ae19d':
  Change InputMessage.motion.pointerSize to a uint32_t.
 2014-05-16 12:10:21 +00:00
Narayan Kamath
cfba3bf160 am c9fcaf37: Merge "Change InputMessage.motion.pointerSize to a uint32_t." 
* commit 'c9fcaf3751af078ad730913304431197e4d1ae80':
  Change InputMessage.motion.pointerSize to a uint32_t.
 2014-05-16 12:08:06 +00:00
Narayan Kamath
c9fcaf3751 Merge "Change InputMessage.motion.pointerSize to a uint32_t." 2014-05-16 12:06:11 +00:00
Narayan Kamath
ed5fd384b7 Change InputMessage.motion.pointerSize to a uint32_t. 
This ensures it's the same size in both 32 and 64 bit
processes and also brings it in line with struct
MotionEntry.

(cherry-picked from bc6001b026)

Change-Id: I28e87050478920a54132efbbb8138076ebad1409
 2014-05-16 12:53:16 +01:00
Todd Poynor
a186e65368 BatteryProperty: Add property ENERGY_COUNTER and 64-bit integer properties 
Also fixup comments to match recent changes in BatteryManager.

Change-Id: I6f40924f9e66d564ad1175f9650e2bfd2ad39a3a
 2014-05-16 03:05:11 +00:00
Vinod Krishnan
37a5e7a21a am bd0f9153: am 7e6c5336: Merge "Adding a portrait and landscape file" into klp-modular-dev 
* commit 'bd0f91537be0e506a92687d6084a2659cf34399c':
  Adding a portrait and landscape file
 2014-05-16 02:45:59 +00:00
Vinod Krishnan
bd0f91537b am 7e6c5336: Merge "Adding a portrait and landscape file" into klp-modular-dev 
* commit '7e6c53366d916e11fd6237c9456c394ff6a1cb1f':
  Adding a portrait and landscape file
 2014-05-16 02:44:10 +00:00
Vinod Krishnan
7e6c53366d Merge "Adding a portrait and landscape file" into klp-modular-dev 2014-05-16 02:41:09 +00:00
Vinod Krishnan
0029ecbb9b Adding a portrait and landscape file 
- Some wearable devices do not support landscape
- CTS tests were expecting some behavior which would not work since
  it was not able to switch from portrait to landscape.
- Creating 2 files and then each of the devices will include that
  particular feature that it supports.

Change-Id: If0e3151e23264a49f4964e1c643b33a90b78c114
 2014-05-15 19:24:18 -07:00
Vinod Krishnan
57ec0ec10d am b017932e: am 035839c6: Adding Feature for HRM 
* commit 'b017932e4a659f637085e37e09e3aa20849d62b8':
  Adding Feature for HRM
 2014-05-16 01:47:33 +00:00
Vinod Krishnan
b017932e4a am 035839c6: Adding Feature for HRM 
* commit '035839c6c291e831c51eea1e9d8b54f9e2382707':
  Adding Feature for HRM
 2014-05-16 01:44:21 +00:00
The Android Automerger
c4780e612f merge in master-release history after reset to 574b641173 2014-05-15 05:50:48 -07:00
Andy Hung
574b641173 Merge "Allow OMX pointer types to be forced to 32 bits" 2014-05-15 03:21:01 +00:00
The Android Automerger
9c7aafad6e merge in master-release history after reset to 2f9a3e73bf 2014-05-14 05:50:47 -07:00
Nick Kralevich
2f9a3e73bf am 449e0dbe: am fc1b9fa3: am b66ee6c3: Merge "Ensure that app lib symlinks are correctly labeled when created." 
* commit '449e0dbe94126553c96cece21da54b40a6880f11':
  Ensure that app lib symlinks are correctly labeled when created.
 2014-05-13 20:41:41 +00:00
Nick Kralevich
449e0dbe94 am fc1b9fa3: am b66ee6c3: Merge "Ensure that app lib symlinks are correctly labeled when created." 
* commit 'fc1b9fa3178d1452629d75e2afa1a9d72f03fc1c':
  Ensure that app lib symlinks are correctly labeled when created.
 2014-05-13 20:38:20 +00:00
Nick Kralevich
fc1b9fa317 am b66ee6c3: Merge "Ensure that app lib symlinks are correctly labeled when created." 
* commit 'b66ee6c32d87961d5b9f0be97b5fdccb928fd453':
  Ensure that app lib symlinks are correctly labeled when created.
 2014-05-13 20:35:38 +00:00
Nick Kralevich
b66ee6c32d Merge "Ensure that app lib symlinks are correctly labeled when created." 2014-05-13 20:32:19 +00:00
Stephen Smalley
3a98389263 Ensure that app lib symlinks are correctly labeled when created. 
At present, the app lib symlinks are created before setting
the package directory security context, and therefore default
to system_data_file.  Upon a later restorecon_recursive,
they are relabeled to the same type as the package directory,
e.g. app_data_file.  Avoid this inconsistency by setting the
package directory security context before creating the symlink
so that it inherits the same security context.

Change-Id: I1ee6ccd8a2aa63a4d2efda67f313c97932235911
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
 2014-05-13 12:59:40 -04:00
The Android Automerger
7e47f99472 merge in master-release history after reset to d763fc7822 2014-05-13 05:50:23 -07:00
Vinod Krishnan
035839c6c2 Adding Feature for HRM 
Change-Id: Iaec58df9c27753ce2c39c6bbe3735f1894684cb5
 2014-05-12 18:05:38 -07:00
Aravind Akella
d763fc7822 am 47d871b2: am d35e3af0: Set default values for FifoMaxEventCount and ReservedEventCount. 
* commit '47d871b2795f714499a34ffe85b67f8577883f7b':
  Set default values for FifoMaxEventCount and ReservedEventCount.
 2014-05-13 00:54:50 +00:00
Aravind Akella
47d871b279 am d35e3af0: Set default values for FifoMaxEventCount and ReservedEventCount. 
* commit 'd35e3af04d4b7e850a3b87b2211d1a3993f9b76f':
  Set default values for FifoMaxEventCount and ReservedEventCount.
 2014-05-13 00:50:40 +00:00
Aravind Akella
d35e3af04d Set default values for FifoMaxEventCount and ReservedEventCount. 
Change-Id: I4f610c2912ffe1697d1ffb99c556d1c88578466e
 2014-05-12 17:15:59 -07:00
Etienne Le Grand
f63cbbf0e4 Merge "Add wake gesture in Sensor.cpp" 2014-05-12 19:38:13 +00:00
Greg Hackmann
f974bffb36 am 38c9e132: am c1ffd351: am bd20e551: Merge "Use asynchronous lock/unlock API" 
* commit '38c9e1327a5b24267c3dab5293bc9d7ada6e9fc9':
  Use asynchronous lock/unlock API
 2014-05-12 18:18:47 +00:00
Greg Hackmann
38c9e1327a am c1ffd351: am bd20e551: Merge "Use asynchronous lock/unlock API" 
* commit 'c1ffd351bc44483369271c11dd4c6391bba8c64c':
  Use asynchronous lock/unlock API
 2014-05-12 18:12:34 +00:00
Greg Hackmann
c1ffd351bc am bd20e551: Merge "Use asynchronous lock/unlock API" 
* commit 'bd20e551f64234142e1146f9fa4b2dcebbd72122':
  Use asynchronous lock/unlock API
 2014-05-12 18:08:13 +00:00
Greg Hackmann
bd20e551f6 Merge "Use asynchronous lock/unlock API" 2014-05-12 18:02:00 +00:00
Francis Hart
8f3960179c Use asynchronous lock/unlock API 
The gralloc API now provides a way for using lock/unlock with the Android
explicit synchronisation concept. This changes updates the GraphicBuffer class
to also expose this functionality, and updates the Surface class to make use of
in line with the dequeueBuffer/queueBuffer mechanism.

This new behaviour is dependent on GRALLOC_MODULE_API_VERSION_0_3. If the local
gralloc module does not support this then the existing synchronous lock/unlock
mechanism will be used.

Change-Id: I8c3fd9592e0c5400ac9be84450f55a77cc0bbdc5
 2014-05-12 09:13:03 -07:00
The Android Automerger
3e80ef8614 merge in master-release history after reset to 2f3dca149a 2014-05-12 05:49:47 -07:00
The Android Automerger
ee6b4dc8fe merge in master-release history after reset to 2f3dca149a 2014-05-11 05:49:51 -07:00
The Android Automerger
d16d98553e merge in master-release history after reset to 2f3dca149a 2014-05-10 05:50:30 -07:00
Greg Hackmann
2f3dca149a am 9493d492: am 9eb142e3: am a9d49f99: Merge "Revert "Use asynchronous lock/unlock API"" 
* commit '9493d4924a59f14b698389386337a9c07a7ea3c4':
  Revert "Use asynchronous lock/unlock API"
 2014-05-09 22:00:04 +00:00
Greg Hackmann
02528cf6aa am 4b46776f: am 8a6cd189: am f60564a1: Merge "Use asynchronous lock/unlock API" 
* commit '4b46776ff88c5a365700b88e8b2b04e1b2c77e6e':
  Use asynchronous lock/unlock API
 2014-05-09 21:54:48 +00:00
Greg Hackmann
9493d4924a am 9eb142e3: am a9d49f99: Merge "Revert "Use asynchronous lock/unlock API"" 
* commit '9eb142e34a5bc11508c0bd6f60ad3933c60aa530':
  Revert "Use asynchronous lock/unlock API"
 2014-05-09 21:51:51 +00:00
Greg Hackmann
9eb142e34a am a9d49f99: Merge "Revert "Use asynchronous lock/unlock API"" 
* commit 'a9d49f99e69d8fc0e60b492b131322c96f47a232':
  Revert "Use asynchronous lock/unlock API"
 2014-05-09 21:46:44 +00:00
Greg Hackmann
a9d49f99e6 Merge "Revert "Use asynchronous lock/unlock API"" 2014-05-09 21:39:07 +00:00
Greg Hackmann
53ec72523a Revert "Use asynchronous lock/unlock API" 
This reverts commit 378ef07760.

Change-Id: I1de5ab973b5383633e75924fe90ac3ca8216c36a
 2014-05-09 21:36:48 +00:00
Greg Hackmann
4b46776ff8 am 8a6cd189: am f60564a1: Merge "Use asynchronous lock/unlock API" 
* commit '8a6cd189034ec4709a66e581b41deba56c028291':
  Use asynchronous lock/unlock API
 2014-05-09 21:13:16 +00:00
Greg Hackmann
8a6cd18903 am f60564a1: Merge "Use asynchronous lock/unlock API" 
* commit 'f60564a13e917877c76c99294194a621d872076b':
  Use asynchronous lock/unlock API
 2014-05-09 21:08:39 +00:00
Greg Hackmann
f60564a13e Merge "Use asynchronous lock/unlock API" 2014-05-09 21:02:21 +00:00
Andy McFadden
9f708e1094 am 39cde06a: (-s ours) am b6601961: Merge "DO NOT MERGE Add "dumpsys SurfaceFlinger --dispsync"" into klp-modular-dev 
* commit '39cde06aee5bc9338b1ed26513233cb54e9b446d':
  DO NOT MERGE Add "dumpsys SurfaceFlinger --dispsync"
 2014-05-09 18:00:54 +00:00
Andy McFadden
39cde06aee am b6601961: Merge "DO NOT MERGE Add "dumpsys SurfaceFlinger --dispsync"" into klp-modular-dev 
* commit 'b66019615da8750588f1233a77b9c686b0a248c3':
  DO NOT MERGE Add "dumpsys SurfaceFlinger --dispsync"
 2014-05-09 17:57:12 +00:00
Andy McFadden
b66019615d Merge "DO NOT MERGE Add "dumpsys SurfaceFlinger --dispsync"" into klp-modular-dev 2014-05-09 17:54:29 +00:00