Tom Cherry 842e5af146 resolve merge conflicts of 7d0c3abcf4 to rvc-dev-plus-aosp ...

Test: I solemnly swear I tested this conflict resolution.
Bug: None
Change-Id: Ia19eb2f0061426915f857fdee1cd6112b4a5f9ad

2020-04-13 13:09:58 -07:00

..

aidl/com/android/internal/compat

Add userId to the package name API.

2019-10-22 21:10:53 +01:00

include/android

…

Android.bp

Merge changes from topic "HWUI_JNI"

2020-02-21 11:43:02 +00:00

asset_manager.cpp

…

configuration.cpp

…

hardware_buffer_jni.cpp

…

input.cpp

…

libandroid_net.map.txt

Rename # vndk tag to # llndk

2019-11-13 05:51:59 +00:00

libandroid.map.txt

Add native Thermal Throttling API to libandroid.

2020-02-19 16:25:25 -08:00

looper.cpp

…

native_activity.cpp

…

native_window_jni.cpp

…

net.c

Add control flags in asynchronous DNS query API

2019-01-08 17:58:32 +08:00

obb.cpp

…

OWNERS

Add junyulai@ as owner of the core networking dirs

2019-03-08 13:04:05 +00:00

sensor.cpp

Add ASensorEventQueue_requestAdditionalInfoEvents

2019-01-18 17:31:05 -08:00

sharedmem.cpp

Include what you use: <fcntl.h>

2020-04-13 11:10:30 -07:00

storage_manager.cpp

Remove DefaultContainerService usage in StorageManagerService.

2018-08-27 15:50:59 -07:00

surface_control.cpp

Add compatibility param to setFrameRate() api

2020-02-17 00:38:43 -08:00

system_fonts.cpp

Make AFont_getLocale work

2019-10-29 19:53:35 +00:00

thermal.cpp

Add native Thermal Throttling API to libandroid.

2020-02-19 16:25:25 -08:00

trace.cpp

Add NDK async begin/end & counter

2018-12-05 18:16:39 -08:00