Colin Cross a42cb8b0e2 resolved conflicts for merge of a67e34c8 to master ...

Change-Id: I597525886260884c9b2dfc7945e01eb8138a58c2

2014-03-21 13:11:02 -07:00

..

camera2

Merge "Camera2: Update exposureTimeRange related docs"

2014-03-19 02:12:08 +00:00

display

am e2c9cd58: Merge "Refactor display manager service to new pattern." into klp-modular-dev

2014-01-18 01:53:32 +00:00

hdmi

Add HDMI-CEC service

2014-03-20 16:40:22 +09:00

input

Add stream-level suppression to vibrate/audio services.

2014-03-19 15:32:51 -04:00

location

Remove unused imports from frameworks/base.

2013-11-20 11:31:47 -05:00

usb

Add support for USB devices with multiple configurations and alternate interfaces

2014-02-27 09:59:02 -08:00

Camera.java

camera: Fix setParameters for Preview FPS single/range values

2014-03-20 00:21:44 +00:00

CameraInfo.aidl

camera: Add Java binder proxies for some existing binder interfaces

2013-06-11 11:36:38 -07:00

CameraInfo.java

camera: Add Java binder proxies for some existing binder interfaces

2013-06-11 11:36:38 -07:00

ConsumerIrManager.java

consumer ir: clarify @link in documentation

2013-09-11 15:39:05 -07:00

GeomagneticField.java

Tabs -> spaces in frameworks/base.

2014-02-25 09:49:29 -05:00

ICamera.aidl

camera: Add Java binder proxies for some existing binder interfaces

2013-06-11 11:36:38 -07:00

ICameraClient.aidl

camera: Add Java binder proxies for some existing binder interfaces

2013-06-11 11:36:38 -07:00

ICameraService.aidl

camera3: Pass vendor tags through binder.

2014-03-13 12:14:49 -07:00

ICameraServiceListener.aidl

camera: Add Java binder proxies for some existing binder interfaces

2013-06-11 11:36:38 -07:00

IConsumerIrService.aidl

Add consumer IR framework

2013-09-11 09:52:47 -07:00

IProCameraCallbacks.aidl

camera: Add Java binder proxies for some existing binder interfaces

2013-06-11 11:36:38 -07:00

IProCameraUser.aidl

camera: Add Java binder proxies for some existing binder interfaces

2013-06-11 11:36:38 -07:00

ISerialManager.aidl

…

LegacySensorManager.java

…

package.html

…

Sensor.java

Sensor batching APIs for review.

2013-09-06 15:11:50 -07:00

SensorEvent.java

revise docs for new sensor types. fix markup error causing tons of code font

2013-06-13 16:37:51 -07:00

SensorEventListener2.java

Fix registerListener and flush bugs.

2013-10-09 19:00:22 -07:00

SensorEventListener.java

docs: Fix a bunch of issues

2013-01-11 23:44:11 -08:00

SensorListener.java

…

SensorManager.java

am e7f7af96: am 35c8ebab: Merge "take account of RotationVector\'s new extra parameter"

2014-03-11 00:11:05 +00:00

SerialManager.java

Remove unused imports from frameworks/base.

2013-11-20 11:31:47 -05:00

SerialPort.java

Remove unused imports from frameworks/base.

2013-11-20 11:31:47 -05:00

SystemSensorManager.java

AArch64: Use long for pointers in hardware classes

2014-01-08 10:17:21 +00:00

TriggerEvent.java

Add new sensor types.

2013-04-11 10:25:35 -07:00

TriggerEventListener.java

small cleanup of trigger event javadoc

2013-06-05 14:29:50 -07:00