diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2018-04-25 21:45:23 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-04-25 21:45:23 +0000 |
| commit | 52090e064bda4c8ef57ec3bb7c2f71e147adf33b (patch) | |
| tree | 34ab3d507910798e10184c9e1910c6c7cf8c27f4 | |
| parent | 2b45d2f3305699b2e62968f4a94d734afb9e1d93 (diff) | |
| parent | a5e230ee27a5d32441650b9c1edb497b861bed72 (diff) | |
| download | cuttlefish-52090e064bda4c8ef57ec3bb7c2f71e147adf33b.tar.gz | |
Merge "Revert "Disable OEM hook."" into pi-dev
| -rw-r--r-- | shared/config/manifest.xml | 9 | ||||
| -rw-r--r-- | shared/device.mk | 2 |
2 files changed, 9 insertions, 2 deletions
diff --git a/shared/config/manifest.xml b/shared/config/manifest.xml index 2d16d6f06..26e33148b 100644 --- a/shared/config/manifest.xml +++ b/shared/config/manifest.xml @@ -197,6 +197,15 @@ </interface> </hal> <hal format="hidl"> + <name>android.hardware.radio.deprecated</name> + <transport>hwbinder</transport> + <version>1.0</version> + <interface> + <name>IOemHook</name> + <instance>slot1</instance> + </interface> + </hal> + <hal format="hidl"> <name>android.hardware.sensors</name> <transport>hwbinder</transport> <version>1.0</version> diff --git a/shared/device.mk b/shared/device.mk index 1d498e3c4..2332a9441 100644 --- a/shared/device.mk +++ b/shared/device.mk @@ -18,8 +18,6 @@ PRODUCT_COPY_FILES += device/google/cuttlefish_kernel/4.4-x86_64/kernel:kernel PRODUCT_SHIPPING_API_LEVEL := 26 -DISABLE_RILD_OEM_HOOK := true - # Explanation of specific properties: # debug.hwui.swap_with_damage avoids boot failure on M http://b/25152138 # ro.opengles.version OpenGLES 2.0 |