diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2019-05-07 03:16:03 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2019-05-07 03:16:03 +0000 |
| commit | 00f9e099d4b00e75f366a2433d54903171a59291 (patch) | |
| tree | 731410b8bcfb3350f53c3c89f75b3dff08c26fb5 | |
| parent | 6f91d1def9b67360204fe9785d13ff43e375a2ca (diff) | |
| parent | cb39647a9b089f1205e813fefedcb3264c029946 (diff) | |
| download | android_device_generic_goldfish-00f9e099d4b00e75f366a2433d54903171a59291.tar.gz android_device_generic_goldfish-00f9e099d4b00e75f366a2433d54903171a59291.tar.bz2 android_device_generic_goldfish-00f9e099d4b00e75f366a2433d54903171a59291.zip | |
Snap for 5537346 from cb39647a9b089f1205e813fefedcb3264c029946 to qt-release
Change-Id: I095088eaeb69fbca7d4619be4777838d6f9eb3f2
| -rw-r--r-- | gralloc/Android.mk | 1 | ||||
| -rw-r--r-- | gralloc/gralloc.cpp | 4 | ||||
| -rw-r--r-- | sepolicy/common/netd.te | 1 |
3 files changed, 5 insertions, 1 deletions
diff --git a/gralloc/Android.mk b/gralloc/Android.mk index a837f0a..8576e91 100644 --- a/gralloc/Android.mk +++ b/gralloc/Android.mk @@ -32,6 +32,7 @@ LOCAL_HEADER_LIBRARIES := libhardware_headers LOCAL_MODULE := gralloc.goldfish.default LOCAL_CFLAGS:= -DLOG_TAG=\"gralloc\" -Wno-missing-field-initializers +LOCAL_CFLAGS:= -DPLATFORM_VERSION=$(PLATFORM_VERSION) ifeq ($(TARGET_USE_PAN_DISPLAY),true) LOCAL_CFLAGS += -DUSE_PAN_DISPLAY=1 endif diff --git a/gralloc/gralloc.cpp b/gralloc/gralloc.cpp index 07bbfba..97e6857 100644 --- a/gralloc/gralloc.cpp +++ b/gralloc/gralloc.cpp @@ -89,6 +89,10 @@ struct private_module_t HAL_MODULE_INFO_SYM = { .unregisterBuffer = gralloc_unregister_buffer, .lock = gralloc_lock, .unlock = gralloc_unlock, +#if PLATFORM_VERSION > 9 + .validateBufferSize = NULL, + .getTransportSize = NULL, +#endif }, .framebuffer = 0, .flags = 0, diff --git a/sepolicy/common/netd.te b/sepolicy/common/netd.te index 1176c05..09a28b9 100644 --- a/sepolicy/common/netd.te +++ b/sepolicy/common/netd.te @@ -1,4 +1,3 @@ dontaudit netd self:capability sys_module; #TODO: This can safely be ignored until b/62954877 is fixed dontaudit netd kernel:system module_request; -allow netd self:bpf { map_create map_read map_write }; |