Neil Fuller c2a0b4482d resolved conflicts for merge of ee665151 to lmp-mr1-dev-plus-aosp ...

Change-Id: I2588c65b7a9fa43f968151a206924a804f0595a7

2014-10-02 14:32:37 +01:00

..

camera2

Merge "Camera2 Legacy: Set a default thumbnail size" into lmp-dev

2014-09-30 23:44:58 +00:00

display

VirtualDisplay.Callbacks -> Callback

2014-09-01 23:49:57 -07:00

hdmi

CEC: Bug fixes for vendor-specific command handling

2014-09-12 16:22:23 +09:00

input

Respect intent-filter priority for system keyboard layouts.

2014-09-18 18:48:19 -07:00

location

Add @SystemApi annotation to Geofence Hardware types.

2014-08-18 10:22:23 -07:00

soundtrigger

SoundTrigger: fix KeyphraseRecognitionEvent parceling

2014-09-12 15:45:47 -07:00

usb

USB: Minor cleanup from API council review

2014-05-20 11:14:58 -07:00

Camera.java

camera2: legacy: disable shutter sounds unconditionally via camera2 api

2014-08-19 15:11:31 -07:00

CameraInfo.aidl

…

CameraInfo.java

…

ConsumerIrManager.java

Fix a typo in a javadoc comment

2014-01-24 11:57:59 +02:00

GeomagneticField.java

resolved conflicts for merge of ee665151 to lmp-mr1-dev-plus-aosp

2014-10-02 14:32:37 +01:00

ICamera.aidl

…

ICameraClient.aidl

…

ICameraService.aidl

Camera: Implement HAL1 and higher HAL API coexistence

2014-06-19 15:46:02 -07:00

ICameraServiceListener.aidl

…

IConsumerIrService.aidl

…

IProCameraCallbacks.aidl

…

IProCameraUser.aidl

…

ISerialManager.aidl

…

LegacySensorManager.java

…

package.html

…

Sensor.java

Documentation fix for Sensor.getMaxDelay()

2014-09-04 16:24:41 -07:00

SensorEvent.java

…

SensorEventListener2.java

SensorManager API changes.

2014-07-29 17:41:02 -07:00

SensorEventListener.java

Add confidence to the heart rate monitor definition and clarify onAccuracyChange

2014-05-23 19:14:33 -07:00

SensorListener.java

…

SensorManager.java

SensorManager API changes.

2014-07-29 17:41:02 -07:00

SerialManager.java

…

SerialPort.java

…

SystemSensorManager.java

Add java APIs for Sensor reportingMode.

2014-06-09 16:56:29 -07:00

TriggerEvent.java

…

TriggerEventListener.java

…