Commit Graph

1756 Commits

Author SHA1 Message Date
Jeff Tinker
03a0571e96 Fix non-portable definition of CryptoPlugin::SubSample
bug: 16016106
Change-Id: I76514b2e7a28c86a0b0b311af575ca9dfc9471a9
2014-07-01 14:54:45 -07:00
Dan Stoza
dc56bf721a Merge "BufferQueue: Add allocateBuffers method" 2014-06-27 15:56:14 +00:00
Dan Stoza
ab57491de3 GLConsumer: Allow creation in detached mode
Adds a constructor that doesn't require a GLES texture name and sets
up the GLConsumer in detached mode.

Bug: 15616428
Change-Id: Idc9ea2e59baa24bbd959da9fffe0fb71c0aa9818
2014-06-25 15:00:48 -07:00
Dan Stoza
e49ba8e2ed GLConsumer: Stop using default constructor params
Removes the dependency on default constructor parameters for
GLConsumer so that a different constructor prototype can safely be
added.

Change-Id: I0da924bbd4c141edbf305598c1be8bc575654680
2014-06-24 13:09:19 -07:00
Dan Stoza
29a3e90879 BufferQueue: Add allocateBuffers method
This adds an allocateBuffers method to BufferQueue, which instructs
it to allocate up to the maximum number of buffers allowed by the
current configuration. The goal is that this method can be called
ahead of render time, which will prevent dequeueBuffers from blocking
in allocation and inducing jank.

This interface is also plumbed up to the native Surface (and, in
another change, up to the Java Surface and ThreadedRenderer).

Bug: 11792166
Change-Id: I4aa96b4351ea1c95ed5db228ca3ef98303229c74
2014-06-20 13:13:57 -07:00
Andy McFadden
91b2ca8562 Add two new display info fields
This adds SurfaceFlinger's app VSYNC offset and buffer deadline
values to DisplayInfo.

Bug 14612039

Change-Id: Ie0ab21d388fe2764f2b6f71bd1cefa33dc861a73
2014-06-17 10:41:46 -07:00
Narayan Kamath
f8f419bfcd Merge "Remove Parcel::writeIntPtr." 2014-06-10 21:18:16 +00:00
Narayan Kamath
7da40c0a84 Remove Parcel::writeIntPtr.
All uses of this API have been removed. It should
never have been made public in the first place.

bug: 15424960
Change-Id: Id07d24ec95b2b393e6da138a7e8a9a4ecebeca94
2014-06-12 15:26:39 +01:00
Aravind Akella
adb65d9add Merge "Surface reportingMode for Sensors." 2014-06-12 03:30:50 +00:00
Aravind Akella
0e025c5af3 Surface reportingMode for Sensors.
Change-Id: Iac8dd3408c90eb7d285a2e8043131fab3a7e58fa
2014-06-12 14:49:41 -07:00
Prashant Malani
7227b96a73 Merge "surfaceflinger: Replace blank/unblank with setPowerMode" 2014-06-12 03:30:50 +00:00
Narayan Kamath
f905bc3bdc Remove Parcel::writeIntPtr.
All uses of this API have been removed. It should
never have been made public in the first place.

bug: 15424960

(cherry picked from commit 7da40c0a84)

Change-Id: I8d89f62dbdaee7149ef908e0c97417b85e0c48a2
2014-06-13 10:27:33 +01:00
Michael Wright
8f6710fdeb Bump axis limit
Change-Id: I53d18646be2b884c5022f10c7c4ea8f6cda176c8
2014-06-09 18:56:43 -07:00
Lajos Molnar
6445efde47 am 64f5ec51: fix compiler warning in OMX_VideoExt.h
* commit '64f5ec51ad3a9aea5a849d51139e605815b42d75':
  fix compiler warning in OMX_VideoExt.h
2014-06-06 06:58:39 +00:00
Lajos Molnar
64f5ec51ad fix compiler warning in OMX_VideoExt.h
Bug: 11969958
Change-Id: I6dbc1c5a56c5f8db0af931c9391299aaaf1b536a
2014-06-05 22:33:52 -07:00
Prashant Malani
2c9b11f029 surfaceflinger: Replace blank/unblank with setPowerMode
We replace the blank/unblank calls in surfaceFlinger with a more generic
setPowerMode() routine.

Some displays support different power modes (for example, with reduced
color palettes). Depending on the use case we should be able to toggle
these modes, so as to achieve incremental power savings.

Initially, three power modes will be supported:
- HWC_POWER_MODE_OFF
- HWC_POWER_MODE_DOZE
- HWC_POWER_MODE_NORMAL

HWC_POWER_MODE_OFF will correspond to blanking the display, while
HWC_POWER_MODE_NORMAL will correspond to unblanking. HWC_POWER_MODE_DOZE
will put the display into a low power setting, if it is supported in
hardware.

If such a low power mode is not supported, it should be treated as a
call to set the mode to HWC_POWER_MODE_NORMAL.

As a consequence of adding the mPowerMode field, the mScreenAcquired is
no longer required, and thus references to it are removed and replaced
equivalent references to mPowerMode.

We also add the glue code to connect the services invocation of setting
a power mode and the HAL implementation in HWComposer.

Bug: 13472578
Change-Id: I431595ecf16d2f2c94259272db3dd42f29636204
Signed-off-by: Prashant Malani <pmalani@google.com>
2014-06-05 16:35:52 -07:00
Aravind Akella
e75b7b491e Remove getRequiredPermission from NDK.
Bug: 15089664
Change-Id: Ic967adde89f30261c75fca67c09d14d35bd1cdb3
(cherry picked from commit 1236710bcc)
2014-06-05 22:24:49 +00:00
Narayan Kamath
db1972bd8e am 26063a91: am f1dd859b: Merge "x86_64: Align uint64_t/int64_t structure member to 8 bytes"
* commit '26063a9155ddd18d858cea7fac7c1ddf71e1bcb7':
  x86_64: Align uint64_t/int64_t structure member to 8 bytes
2014-06-03 13:58:40 +00:00
Narayan Kamath
26063a9155 am f1dd859b: Merge "x86_64: Align uint64_t/int64_t structure member to 8 bytes"
* commit 'f1dd859baa114995bcbcfb7119e939d0b4f45ed5':
  x86_64: Align uint64_t/int64_t structure member to 8 bytes
2014-06-03 13:29:00 +00:00
Narayan Kamath
f1dd859baa Merge "x86_64: Align uint64_t/int64_t structure member to 8 bytes" 2014-06-03 10:06:55 +00:00
Fengwei Yin
83e0e425c6 x86_64: Align uint64_t/int64_t structure member to 8 bytes
To make sure the stature which pass between 32/64bit process have
same memory layout for 32/64bit.

Signed-off-by: Fengwei Yin <fengwei.yin@intel.com>
Co-Authored-by: Narayan Kamath <narayan@google.com> (Unit test only.)
Change-Id: I1bc2d12cce41ec0bc484adcaf968f274bec75c12
2014-05-30 14:13:29 +01:00
Dan Stoza
3d5c8a98c1 Merge "SurfaceFlinger: Add sourceCrop to screenshot" 2014-05-28 18:31:40 +00:00
Aravind Akella
812f15f2f9 Merge "Surface maxDelay and isWakeUpSensor flag in Sensor.java." 2014-05-27 19:38:00 +00:00
Etienne Le Grand
03b1a9db9d am b3a65bb0: am 9dcd38ad: Merge "Add heart rate to ASensorEvent" into klp-modular-dev
* commit 'b3a65bb0c2d2f6e660510efe0d93b3d26b0b2bf9':
  Add heart rate to ASensorEvent
2014-05-27 18:14:51 +00:00
Etienne Le Grand
b3a65bb0c2 am 9dcd38ad: Merge "Add heart rate to ASensorEvent" into klp-modular-dev
* commit '9dcd38ad3b8335308b59932718e3f145aa50d318':
  Add heart rate to ASensorEvent
2014-05-27 18:10:16 +00:00
Etienne Le Grand
9dcd38ad3b Merge "Add heart rate to ASensorEvent" into klp-modular-dev 2014-05-27 18:02:49 +00:00
Aravind Akella
d9441e4c27 Surface maxDelay and isWakeUpSensor flag in Sensor.java.
Change-Id: Idd1e9045190beeca87b086b272e8cbf0bed05bae
2014-05-23 18:58:01 -07:00
Etienne Le Grand
630e31d6ed Add heart rate to ASensorEvent
Change-Id: Ic82838b17a575de93d499e44a454bb382f17678f
2014-05-23 12:35:10 -07:00
Aravind Akella
72c524dd8c am 040730e8: am 1236710b: Remove getRequiredPermission from NDK.
* commit '040730e8954b2f686390434646f82bc333de7058':
  Remove getRequiredPermission from NDK.
2014-05-23 18:04:27 +00:00
Dan Stoza
c18790018b SurfaceFlinger: Add sourceCrop to screenshot
Adds a sourceCrop Rect parameter to screenshot commands, which allows
clients to capture only a portion of the screen instead of the whole
screen.

Bug: 15137922
Change-Id: I629447573cd34ffb96334cde7ba02490b9ea06d8
2014-05-23 09:19:03 -07:00
Aravind Akella
040730e895 am 1236710b: Remove getRequiredPermission from NDK.
* commit '1236710bccd8f5870c0281e24a899c3d58f708e6':
  Remove getRequiredPermission from NDK.
2014-05-22 22:44:55 +00:00
Aravind Akella
1236710bcc Remove getRequiredPermission from NDK.
Change-Id: Ic967adde89f30261c75fca67c09d14d35bd1cdb3
2014-05-22 13:19:49 -07:00
Jeff Brown
b9e879d429 Merge "Support VIRTUAL flag in keyboard layouts." 2014-05-21 02:34:36 +00:00
Jeff Brown
5a7d2f9a15 Support VIRTUAL flag in keyboard layouts.
This flag is used to provide haptic feedback for virtual hard keys.

Bug: 14319563
Change-Id: Ia0ca1acc8cfa00a42d1c04d279dfa59c6cc00f4d
2014-05-20 17:29:30 -07:00
Jinsuk Kim
bc4e396d17 New keycode definitions for HDMI-CEC
Following keys are added to be mapped to HDMI-CEC standard keys:

KEYCODE_MEDIA_TOP_MENU
KEYCODE_11
KEYCODE_12
KEYCODE_LAST_CHANNEL
KEYCODE_TV_DATA_SERVICE

Change-Id: Ie73cf4cd8355ced4753eb5bba0ea130b087dfc36
2014-05-20 07:51:18 +09: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
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
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
Andy Hung
574b641173 Merge "Allow OMX pointer types to be forced to 32 bits" 2014-05-15 03:21:01 +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
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
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
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
Andy Hung
abec6ad341 Allow OMX pointer types to be forced to 32 bits
Enabled by #define.  Is used for 64 bit compilation to
force structs to use 32 bit pointer values for eventual
IPC to 32 bit OMX codecs.

May change later if we support 64 bit OMX codecs.

Change-Id: I0d12f86774f6f7ce9c39c8abea5d51988a7eef11
Signed-off-by: Andy Hung <hunga@google.com>
2014-05-07 11:12:34 -07:00
Dan Stoza
dd02391756 Merge "Enable changing display configuration" 2014-05-06 21:08:16 +00:00
Narayan Kamath
4522f5749d Merge "Change InputMessage.motion.pointerSize to a uint32_t." 2014-05-06 10:00:57 +00:00
Rachad
6900656b2d Merge "HEVC Support Added HEVC enums and structures to OMX header files" 2014-05-06 00:39:10 +00:00
Dan Stoza
7f7da32569 Enable changing display configuration
This allows querying and switching display device configurations
through the ISurfaceComposer/SurfaceComposerClient interface.

Bug: 14320401
Change-Id: I8c22165698950e5da32204c1c4da92122f91a715
2014-05-05 16:45:26 -07:00
Rachad
184077dee4 HEVC Support
Added HEVC enums and structures to OMX header files

Change-Id: If4135c6df86df51098fc7a979543975ed70b0641
2014-05-05 12:03:54 -07:00
Francis Hart
378ef07760 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: I77daa1beb197b63b1c2f281b8414ac4ae4b5b03c
2014-05-02 13:28:14 -07:00
Narayan Kamath
bc6001b026 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.

Change-Id: I66bb8b8d8664763e7dcbd489686051f563d5e1dc
2014-05-02 17:58:43 +01:00
Michael Wright
32ccf558ce Merge "Move key attribute information out of native." 2014-04-29 22:31:18 +00:00
Bill Yi
e4f00b2aae Merge commit '6d05ef2310bdc84811d5b0385b009ad11447a749' into HEAD 2014-04-29 11:34:19 -07:00
Alex Glaznev
c215abe8e8 Merge "Add VP8 encoder extra parameters structure to support configuring encoder key frame interval, number of temporal layers, type of temporal layer pattern and minimum and maximum quantization parameters." 2014-04-24 21:53:30 +00:00
Aravind Akella
943de2f71b Merge "Enable wakeup sensors." 2014-04-24 00:41:08 +00:00
Alex Glaznev
5b155b84a2 Add VP8 encoder extra parameters structure to support
configuring encoder key frame interval, number of
temporal layers, type of temporal layer pattern
and minimum and maximum quantization parameters.

Bug: 11969958
Change-Id: I561e03148a7c5d928b5bf350ad3631ae69871065
2014-04-23 17:15:18 -07:00
Aravind Akella
9a844cf78f Enable wakeup sensors.
SensorService should hold a wakelock till the app reads events from a wakeup sensor. Currently drivers hold a wakelock with a
timeout while delivering events from a wake up sensor like Significant Motion. This hack can be removed now.

Bug: 9774884
Change-Id: If3b5acb99c9cf0cd29012fcfa9d6b04c74133d01
2014-04-23 14:38:56 -07:00
Michael Wright
872db4f11e Move key attribute information out of native.
Native doesn't ever actually care about the attributes of keys, so
move all of it up into the managed layer and move all of the key
names down so they're defined once.

Change-Id: Ic8ded13ce050b2b98744735ff50d11e8d882d7d5
2014-04-22 16:55:36 -07:00
Dan Stoza
e0d5862ad8 Remove deprecated BufferQueue constructor
Finally remove the BufferQueue constructor itself. From now on, all
BufferQueues must be created through the createBufferQueue method.

Bug: 13415624
Change-Id: I192bf9430265bab761dcd59db1f02c9d0ac4feed
2014-04-22 14:12:55 -07:00
Dan Stoza
fb39827ebc Merge "BufferQueue: Increase max slots from 32 to 64" 2014-04-21 16:11:22 +00:00
Dan Stoza
febd4f4f46 BufferQueue: Increase max slots from 32 to 64
Increases NUM_BUFFER_SLOTS from 32 to 64 and changes the mask
returned by IGBC::getReleasedBuffers from 32 to 64 bits.

Bug: 13174352
Change-Id: Ie8ef0853916cfb91f83881c7241886bb1950f01a
2014-04-18 11:40:14 -07:00
Dan Stoza
99b18b447d BufferQueue: Add StreamSplitter
Adds a StreamSplitter class, that takes one IGraphicBufferConsumer
interface and multiple IGraphicBufferProducer interfaces and
implements a one-to-many broadcast of GraphicBuffers (while managing
fences correctly).

Change-Id: I38ecdf3e311ac521bc781c30dde0cc382a4376a3
2014-04-15 10:34:10 -07:00
Dan Stoza
d9822a3843 BufferQueueProducer: add detachNextBuffer
Adds a new method, IGBP::detachNextBuffer, that effectively does
dequeue + request + detach in a single call, but does not need to
know anything about the dequeued buffer, and will not block on
dequeue. This is mostly for the upcoming StreamSplitter to use in
its onBufferReleased callback.

Change-Id: Ie88a69de109003acebaa486a5b44c8a455726550
2014-04-15 10:27:25 -07:00
Aravind Akella
93b84e39e6 am ef89f763: am cf818ebb: Merge "Add stringType and requiredPermission to sensors, effectively adding permission checking for sensors" into klp-modular-dev
* commit 'ef89f7638c43ce5f73e32d487bf65c3375995e3b':
  Add stringType and requiredPermission to sensors, effectively adding permission checking for sensors
2014-04-11 19:40:33 +00:00
Aravind Akella
ef89f7638c am cf818ebb: Merge "Add stringType and requiredPermission to sensors, effectively adding permission checking for sensors" into klp-modular-dev
* commit 'cf818ebbf07c6a20ef48d71bf82f8d4bdf3a398c':
  Add stringType and requiredPermission to sensors, effectively adding permission checking for sensors
2014-04-11 19:34:53 +00:00
Aravind Akella
cf818ebbf0 Merge "Add stringType and requiredPermission to sensors, effectively adding permission checking for sensors" into klp-modular-dev 2014-04-11 19:32:28 +00:00
Dan Stoza
21f18e6935 Merge "Add unique ID to GraphicBuffer" 2014-04-11 18:56:04 +00:00
Dan Stoza
fd34b65f71 Merge "BufferQueue: Add producer buffer-released callback" 2014-04-11 17:57:12 +00:00
Jeff Brown
88a34b2f43 am 974279d9: am db19e463: Remove unnecessary policy flags.
* commit '974279d98917c589181b70ea1c377842e7717643':
  Remove unnecessary policy flags.
2014-04-11 08:46:03 +00:00
Jeff Brown
974279d989 am db19e463: Remove unnecessary policy flags.
* commit 'db19e463fe5a4e00a0214c564527ba67f31e1afb':
  Remove unnecessary policy flags.
2014-04-11 03:53:32 +00:00
Aravind Akella
700180487f Add stringType and requiredPermission to sensors, effectively adding permission checking for sensors
This reverts commit 4369a4ebd5.

Change-Id: Ifa8619cc6873470a07a987763d818d78d4232610
2014-04-11 00:06:06 +00:00
Svetoslav
cf8684b206 Merge "Adding render stats APIs to UiAutomation (framework native)." 2014-04-10 19:32:44 +00:00
Svetoslav
d85084b2b6 Adding render stats APIs to UiAutomation (framework native).
bug:12927198

Change-Id: Ibb1c07f7d89e11281e5c1f27f412a29ac6f9c4ab
2014-04-10 12:32:19 -07:00
Jeff Brown
db19e463fe Remove unnecessary policy flags.
Bug: 13133142
Change-Id: Ib6c63ebad25d84f78623b4a46ccf83953d235fe7
2014-04-09 17:04:44 -07:00
Dan Stoza
b3d0bdf0db BufferQueue: Remove Bn version of create*
It turns out that there's no reason to have both I* and Bn* versions
of the createBufferQueue method, so I removed the Bn* version.

Change-Id: I66aeb09e10458ae540ddf1f38d2d0154ea8f315b
2014-04-07 17:00:26 -07:00
Etienne Le Grand
75b332037f am 4369a4eb: Revert "Add stringType and requiredPermission to sensors, effectively adding permission checking for sensors"
* commit '4369a4ebd5ae7567e7075bc82830b83178099ed5':
  Revert "Add stringType and requiredPermission to sensors, effectively adding permission checking for sensors"
2014-04-05 09:06:00 +00:00
Etienne Le Grand
30d6fd6b28 Revert "Add stringType and requiredPermission to sensors, effectively adding permission checking for sensors"
This reverts commit c57a019e11.

Change-Id: I3540565bc3e56a32cf3b176a29216cf68bb763b2
(cherry picked from commit 4369a4ebd5)
2014-04-05 06:13:41 +00:00
Etienne Le Grand
4369a4ebd5 Revert "Add stringType and requiredPermission to sensors, effectively adding permission checking for sensors"
This reverts commit c57a019e11.

Change-Id: I3540565bc3e56a32cf3b176a29216cf68bb763b2
2014-04-05 05:02:22 +00:00
Etienne Le Grand
33458f72e1 am 00f4dde1: am c57a019e: Add stringType and requiredPermission to sensors, effectively adding permission checking for sensors
* commit '00f4dde1aa88576811bca79bc8242e1fc1edb333':
  Add stringType and requiredPermission to sensors, effectively adding permission checking for sensors
2014-04-05 03:53:51 +00:00
Etienne Le Grand
00f4dde1aa am c57a019e: Add stringType and requiredPermission to sensors, effectively adding permission checking for sensors
* commit 'c57a019e117117c5a76c772970b26cd0f5db8c6a':
  Add stringType and requiredPermission to sensors, effectively adding permission checking for sensors
2014-04-05 01:52:28 +00:00
Etienne Le Grand
c57a019e11 Add stringType and requiredPermission to sensors, effectively adding permission checking for sensors
Change-Id: If0f3dbdb5d2e9378e1fed4614baee4e750d0c850
2014-04-04 16:31:09 -07:00
John Spurlock
9ae71b0060 am 17251cd4: am ad98ad04: Add ACONFIGURATION_UI_MODE_TYPE_WATCH to configuation enum.
* commit '17251cd445cf80cfb6085a1b0b317cd85ad5be00':
  Add ACONFIGURATION_UI_MODE_TYPE_WATCH to configuation enum.
2014-04-04 19:34:07 +00:00
John Spurlock
17251cd445 am ad98ad04: Add ACONFIGURATION_UI_MODE_TYPE_WATCH to configuation enum.
* commit 'ad98ad0493625578f19c727576d02725b82f927c':
  Add ACONFIGURATION_UI_MODE_TYPE_WATCH to configuation enum.
2014-04-04 19:28:07 +00:00
Greg Hackmann
786e26a886 am 3b1cb037: am 27f8840f: Merge "make struct Event layout consistent on 32/64-bit"
* commit '3b1cb037eea56dba0d134c6858f8ddc0f9743ff8':
  make struct Event layout consistent on 32/64-bit
2014-04-04 01:53:51 +00:00
Greg Hackmann
3b1cb037ee am 27f8840f: Merge "make struct Event layout consistent on 32/64-bit"
* commit '27f8840f228abfe5e2458a261ce5403871495a54':
  make struct Event layout consistent on 32/64-bit
2014-04-04 00:08:11 +00:00
John Spurlock
ad98ad0493 Add ACONFIGURATION_UI_MODE_TYPE_WATCH to configuation enum.
Bug:13395758
Change-Id: Iecdae299bfd030f86145d02fa7860374b5a40a74
2014-04-03 16:39:17 -04:00
Glenn Kasten
18b94aa848 am fb3bbd1d: am d2f76332: Merge "AArch64: Correction to OMX_U32 and OMX_S32"
* commit 'fb3bbd1df323c24dc10c095f29ee8010fc3d1df0':
  AArch64: Correction to OMX_U32 and OMX_S32
2014-04-03 17:22:56 +00:00
Glenn Kasten
fb3bbd1df3 am d2f76332: Merge "AArch64: Correction to OMX_U32 and OMX_S32"
* commit 'd2f7633277dd13ac269adb51c4e7a85746e6c599':
  AArch64: Correction to OMX_U32 and OMX_S32
2014-04-03 17:14:50 +00:00
Greg Hackmann
27f8840f22 Merge "make struct Event layout consistent on 32/64-bit" 2014-04-03 17:07:09 +00:00
Glenn Kasten
d2f7633277 Merge "AArch64: Correction to OMX_U32 and OMX_S32" 2014-04-03 17:00:59 +00:00
Narayan Kamath
7f4fe6e586 am d09b2acd: am 033bdd72: Merge "Remove global variables from ProcessState."
* commit 'd09b2acdc8ca706c65984956e61c0bb333cee992':
  Remove global variables from ProcessState.
2014-04-03 16:56:29 +00:00