Jiyong Park d47b8c7137 resolve merge conflicts of d8a2e2f0 to master ...

Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ia7089a9e208961cc581bc7ee28de82e6b73bdccb

2017-09-08 08:21:35 +09:00

audio

Allow partially dynamic profile in the audio policy config am: 3092b31b14

2017-09-06 23:44:16 +00:00

automotive

Merge "Additonal usage note updates for Audio properties" into oc-mr1-dev am: ecc01b9c36

2017-09-06 23:26:05 +00:00

biometrics

biometrics: fingerprint: add locking to default impl

2017-08-18 21:22:46 +00:00

bluetooth

Bluetooth: Remove credit check from Loopback tests am: 0e06a63c76 am: 8f2ea671d9

2017-09-07 01:50:04 +00:00

boot

Revert "Revert "Updating all makefiles.""

2017-08-11 23:02:01 +00:00

broadcastradio

VTS tests now static link to HAL def libs.

2017-08-28 19:23:36 +00:00

camera

Merge "Update vts test to use the updated test template." into oc-mr1-dev

2017-08-30 22:19:55 +00:00

cas

Merge "cas: fix missing error code conversion" into oc-mr1-dev am: e1333de647

2017-08-31 00:02:36 +00:00

configstore

Configstore HAL is down-revisioned to 1.0

2017-09-01 04:53:46 +00:00

contexthub

VTS tests now static link to HAL def libs.

2017-08-28 19:23:36 +00:00

drm

Merge "Drm test static links to HAL def libs." into oc-mr1-dev

2017-08-24 21:54:47 +00:00

dumpstate

VTS tests now static link to HAL def libs. #2

2017-08-10 17:44:57 +00:00

gatekeeper

Revert "Revert "Updating all makefiles.""

2017-08-11 23:02:01 +00:00

gnss

Merge "Adding owners for gnss hardware interfaces" into oc-mr1-dev am: f5c1dc8d31

2017-08-31 00:35:03 +00:00

graphics

Merge "Fix VtsHalGraphicsComposerV2_1TargetTest" into oc-mr1-dev

2017-09-05 18:54:22 +00:00

health

Revert "Revert "Updating all makefiles.""

2017-08-11 23:02:01 +00:00

ir

Revert "Revert "Updating all makefiles.""

2017-08-11 23:02:01 +00:00

keymaster

Don't send more than 2K to addRngEntropy

2017-08-11 14:34:37 -06:00

light

Revert "Revert "Updating all makefiles.""

2017-08-11 23:02:01 +00:00

media

bug fix: handle multiple port settings change events signalled at once

2017-09-06 03:49:18 +00:00

memtrack

Revert "Revert "Updating all makefiles.""

2017-08-11 23:02:01 +00:00

minijail

configstore: sandbox with seccomp filter

2017-07-12 12:58:01 -07:00

neuralnetworks

NNAPI Concurrent Query Management -- HAL and VTS update

2017-09-01 11:07:56 -07:00

nfc

Revert "Revert "Updating all makefiles.""

2017-08-11 23:02:01 +00:00

oemlock

Revert "Revert "Updating all makefiles.""

2017-08-11 23:02:01 +00:00

power

VTS tests now static link to HAL def libs.

2017-08-28 19:23:36 +00:00

radio

Add sim absent error for supplyNetworkDepersonalization.

2017-09-02 05:45:44 +00:00

renderscript

Load libRS_internal.so from the rs namespace

2017-08-16 23:35:57 +09:00

sensors

Merge "Augment HotSwitchOperation to test slow to fast case"

2017-09-02 00:38:58 +00:00

soundtrigger

sound trigger: fix array overflow in HAL wrapper

2017-09-07 12:48:41 -07:00

tests

Merge "HAL interface libs for testing are now built as test lib" into oc-mr1-dev

2017-09-07 17:41:14 +00:00

tetheroffload

Merge "Tetheroffload tests static link to HAL def libs." into oc-mr1-dev

2017-08-14 22:26:09 +00:00

thermal

Merge changes I931dafbb,I845672b2 into oc-mr1-dev

2017-09-05 18:55:10 +00:00

tv

Revert "Revert "Updating all makefiles.""

2017-08-11 23:02:01 +00:00

usb

VTS tests now static link to HAL def libs.

2017-08-28 19:23:36 +00:00

vibrator

VTS tests now static link to HAL def libs.

2017-08-28 19:23:36 +00:00

vr

Revert "Revert "Updating all makefiles.""

2017-08-11 23:02:01 +00:00

weaver

Revert "Revert "Updating all makefiles.""

2017-08-11 23:02:01 +00:00

wifi

Merge "wifi(implementation): Remove unnecessary local variable" into oc-mr1-dev

2017-09-05 22:53:56 +00:00

.clang-format

.clang-format: 100 lines

2017-05-02 16:45:27 -07:00

Android.bp

Update comments for VtsHalTargetTestDefaults.

2017-08-03 16:44:29 -07:00

CleanSpec.mk

resolve merge conflicts of d8a2e2f0 to master

2017-09-08 08:21:35 +09:00

compatibility_matrix.26.xml

Merge "Finalize O-MR1 compat matrix." into oc-mr1-dev am: 0289fc42b4

2017-09-05 21:22:03 +00:00

compatibility_matrix.27.xml

Remove media.cas requirement.

2017-09-05 22:59:21 +00:00

compatibility_matrix.current.xml

Merge "Remove media.cas requirement." into oc-mr1-dev am: 05143cf85e

2017-09-06 04:49:31 +00:00

compatibility_matrix.legacy.xml

Merge "Finalize O-MR1 compat matrix." into oc-mr1-dev am: 0289fc42b4

2017-09-05 21:22:03 +00:00

current.txt

Merge "Additonal usage note updates for Audio properties" into oc-mr1-dev am: ecc01b9c36

2017-09-06 23:26:05 +00:00

MODULE_LICENSE_APACHE2

Apache2 module license.

2016-08-30 11:28:36 -07:00

NOTICE

Apache2 module license.

2016-08-30 11:28:36 -07:00

OWNERS

Add OWNERS in hardware/interfaces

2017-06-12 13:20:12 -07:00

PREUPLOAD.cfg

Enable the clang-format pre-submit hook

2017-03-30 13:26:49 -07:00

update-base-files.sh

Add annotations to create gnss-base.h

2017-01-23 08:41:15 -08:00

update-makefiles.sh

Update makefiles from anywhere.

2017-05-11 15:42:32 -07:00

Description

No description provided

134 MiB

Languages

C++ 56.3%

AIDL 41.2%

C 1.5%

Rust 0.4%

Java 0.4%

Other 0.1%