diff options
| -rw-r--r-- | device-common.mk | 2 | ||||
| -rw-r--r-- | gralloc/gralloc_module.cpp | 2 | ||||
| -rw-r--r-- | gralloc960/mali_gralloc_module.cpp | 2 | ||||
| -rw-r--r-- | overlay/frameworks/base/core/res/res/values/config.xml | 3 |
4 files changed, 5 insertions, 4 deletions
diff --git a/device-common.mk b/device-common.mk index 4a6b085c..bd46cb01 100644 --- a/device-common.mk +++ b/device-common.mk @@ -62,7 +62,7 @@ PRODUCT_PROPERTY_OVERRIDES += qemu.hw.mainkeys=0 PRODUCT_PACKAGES += ssh sftp scp sshd ssh-keygen sshd_config start-ssh # Add wifi-related packages -PRODUCT_PACKAGES += libwpa_client wpa_supplicant hostapd wificond wifilogd +PRODUCT_PACKAGES += libwpa_client wpa_supplicant hostapd wificond PRODUCT_PROPERTY_OVERRIDES += wifi.interface=wlan0 \ wifi.supplicant_scan_interval=15 diff --git a/gralloc/gralloc_module.cpp b/gralloc/gralloc_module.cpp index 4937b596..69054780 100644 --- a/gralloc/gralloc_module.cpp +++ b/gralloc/gralloc_module.cpp @@ -529,6 +529,8 @@ private_module_t::private_module_t() base.unlock = gralloc_unlock; base.perform = NULL; base.lock_ycbcr = gralloc_lock_ycbcr; + base.getTransportSize = NULL; + base.validateBufferSize = NULL; #if defined(GRALLOC_MODULE_API_VERSION_0_3) base.lockAsync = gralloc_lock_async; base.unlockAsync = gralloc_unlock_async; diff --git a/gralloc960/mali_gralloc_module.cpp b/gralloc960/mali_gralloc_module.cpp index 39563518..96f79431 100644 --- a/gralloc960/mali_gralloc_module.cpp +++ b/gralloc960/mali_gralloc_module.cpp @@ -166,6 +166,8 @@ private_module_t::private_module_t() base.lockAsync_ycbcr = gralloc_lock_ycbcr_async; base.unlockAsync = gralloc_unlock_async; base.perform = NULL; + base.getTransportSize = NULL; + base.validateBufferSize = NULL; INIT_ZERO(base.reserved_proc); #endif diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml index f2415817..acdf91de 100644 --- a/overlay/frameworks/base/core/res/res/values/config.xml +++ b/overlay/frameworks/base/core/res/res/values/config.xml @@ -30,9 +30,6 @@ <!-- Separate software navigation bar required on this device. --> <bool name="config_showNavigationBar">true</bool> - <!-- Integer indicating the framework scan interval in milliseconds. --> - <integer translatable="false" name="config_wifi_framework_scan_interval">10000</integer> - <!-- XXXXX NOTE THE FOLLOWING RESOURCES USE THE WRONG NAMING CONVENTION. Please don't copy them, copy anything else. --> |