Snap for 4384531 from 146457c2 to oc-m2-release

Change-Id: I4c771be0be894d25f847d508c8333603e0d266ff

Android.mk

@@ -190,6 +190,7 @@ ifeq ($(PRODUCT_FULL_TREBLE),true)
 # Use split SELinux policy
 LOCAL_REQUIRED_MODULES += \
     $(platform_mapping_file) \
+    26.0.cil \
     nonplat_sepolicy.cil \
     plat_sepolicy.cil \
     plat_and_mapping_sepolicy.cil.sha256 \
@@ -378,6 +379,16 @@ current_mapping.cil :=
 #################################
 include $(CLEAR_VARS)
 
+LOCAL_MODULE := 26.0.cil
+LOCAL_SRC_FILES := private/compat/26.0/26.0.cil
+LOCAL_MODULE_CLASS := ETC
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_PATH := $(TARGET_OUT)/etc/selinux/mapping
+
+include $(BUILD_PREBUILT)
+#################################
+include $(CLEAR_VARS)
+
 LOCAL_MODULE := plat_and_mapping_sepolicy.cil.sha256
 LOCAL_MODULE_CLASS := ETC
 LOCAL_MODULE_TAGS := optional

public/attributes

@@ -243,7 +243,7 @@ expandattribute hal_drm false;
 attribute hal_drm_client;
 expandattribute hal_drm_client true;
 attribute hal_drm_server;
-expandattribute hal_drm_server true;
+expandattribute hal_drm_server false;
 attribute hal_cas;
 expandattribute hal_cas false;
 attribute hal_cas_client;