Michael Wright 244f776855 resolve merge conflicts of f013c3f111 to master. ...

Change-Id: I2045187f8fa948a1733cb9a2cdc0a69ae97b5907

2015-10-20 23:48:55 +01:00

..

camera2

am a636be6c: Camera: fix wrong FULL feature string

2015-10-07 21:36:35 +00:00

display

Add support for setting color transforms

2015-09-18 23:37:28 +00:00

fingerprint

Eliminate false error messages when removing all fingerprints

2015-09-16 18:25:54 +00:00

hdmi

CEC: API setSystemAudioMode

2015-03-30 09:43:05 +09:00

input

resolve merge conflicts of f013c3f111 to master.

2015-10-20 23:48:55 +01:00

location

Merge "Disable AR HW when client binder dies." into mnc-dr-dev

2015-08-26 21:09:50 +00:00

radio

broadcast radio API

2015-03-13 15:34:50 -07:00

soundtrigger

Remove unused imports in frameworks/base.

2015-02-28 14:47:49 -05:00

usb

Broadcast ACTION_USB_STATE only if necessary.

2015-08-07 17:26:41 +09:00

Camera.java

Add camera app op - framework

2015-05-02 16:23:19 -07:00

CameraInfo.aidl

…

CameraInfo.java

…

ConsumerIrManager.java

…

GeomagneticField.java

…

ICamera.aidl

…

ICameraClient.aidl

…

ICameraService.aidl

Camera2: Add camera type to getNumberOfCameras.

2015-08-14 14:52:57 -07:00

ICameraServiceListener.aidl

CameraManager: implement flashlight controls

2015-03-03 13:55:07 -08:00

ICameraServiceProxy.aidl

Camera: Add support for notifying NFC stack when camera is active

2015-08-21 17:41:47 -07:00

IConsumerIrService.aidl

…

ISerialManager.aidl

…

LegacySensorManager.java

…

package.html

…

Sensor.java

Add hidden SensorManager APIs for injecting sensor data.

2015-04-23 17:30:04 -07:00

SensorEvent.java

Bug fix and documentation clarification

2015-05-21 18:06:06 -07:00

SensorEventListener2.java

Sensor documentation fixes.

2014-10-13 22:25:46 +00:00

SensorEventListener.java

…

SensorListener.java

…

SensorManager.java

Change MNC codename to just M.

2015-07-29 15:20:21 -07:00

SerialManager.java

…

SerialPort.java

…

SystemSensorManager.java

Fix a possible race condition in SensorManager initialization.

2015-10-19 12:18:37 -07:00

TriggerEvent.java

…

TriggerEventListener.java

…