Snap for 5605988 from 3df5ecdf906cbaaa689190e1026b02a13b9b7f12 to qt-releaseandroid-vts-10.0_r9android-vts-10.0_r8android-vts-10.0_r7android-vts-10.0_r6android-vts-10.0_r5android-vts-10.0_r4android-vts-10.0_r3android-vts-10.0_r2android-vts-10.0_r16android-vts-10.0_r15android-vts-10.0_r14android-vts-10.0_r13android-vts-10.0_r12android-vts-10.0_r11android-vts-10.0_r10android-vts-10.0_r1android-security-10.0.0_r75android-security-10.0.0_r74android-security-10.0.0_r73android-security-10.0.0_r72android-security-10.0.0_r71android-security-10.0.0_r70android-security-10.0.0_r69android-security-10.0.0_r68android-security-10.0.0_r67android-security-10.0.0_r66android-security-10.0.0_r65android-security-10.0.0_r64android-security-10.0.0_r63android-security-10.0.0_r62android-security-10.0.0_r61android-security-10.0.0_r60android-security-10.0.0_r59android-security-10.0.0_r58android-security-10.0.0_r57android-security-10.0.0_r56android-security-10.0.0_r55android-security-10.0.0_r54android-security-10.0.0_r53android-security-10.0.0_r52android-security-10.0.0_r51android-security-10.0.0_r50android-security-10.0.0_r49android-security-10.0.0_r48android-cts-10.0_r9android-cts-10.0_r8android-cts-10.0_r7android-cts-10.0_r6android-cts-10.0_r5android-cts-10.0_r4android-cts-10.0_r3android-cts-10.0_r2android-cts-10.0_r16android-cts-10.0_r15android-cts-10.0_r14android-cts-10.0_r13android-cts-10.0_r12android-cts-10.0_r11android-cts-10.0_r10android-cts-10.0_r1android-10.0.0_r6android-10.0.0_r5android-10.0.0_r47android-10.0.0_r46android-10.0.0_r4android-10.0.0_r3android-10.0.0_r2android-10.0.0_r17android-10.0.0_r11android-10.0.0_r10android-10.0.0_r1android10-tests-releaseandroid10-security-releaseandroid10-s3-releaseandroid10-s2-releaseandroid10-s1-releaseandroid10-release

Change-Id: I9294b360c3f50d6899cab14af741328081ad6bf7

3 files changed, 1 insertions, 18 deletions

diff --git a/shared/device.mk b/shared/device.mk
index 271dde80e..3f1183eb6 100644
--- a/shared/device.mk
+++ b/shared/device.mk
@@ -51,10 +51,6 @@ PRODUCT_PROPERTY_OVERRIDES += \
 PRODUCT_PROPERTY_OVERRIDES += \
     wlan.driver.status=ok
 
-# Cuttlefish does not support ION needed for Codec 2.0
-PRODUCT_PROPERTY_OVERRIDES += \
-    debug.stagefright.ccodec=0
-
 #
 # Packages for various cuttlefish-specific tests
 #
diff --git a/shared/sepolicy/device.te b/shared/sepolicy/device.te
index 38f0a2f0f..c29c2bf32 100644
--- a/shared/sepolicy/device.te
+++ b/shared/sepolicy/device.te
@@ -5,3 +5,4 @@ type region_e2e_test_device, dev_type;
 type region_screen_device, dev_type;
 type socket_forward_device, dev_type;
 type virtual_serial_device, dev_type;
+typeattribute system_block_device super_block_device_type;
diff --git a/shared/sepolicy/recovery.te b/shared/sepolicy/recovery.te
index e55c18b0a..d72dc6428 100644
--- a/shared/sepolicy/recovery.te
+++ b/shared/sepolicy/recovery.te
@@ -1,17 +1,3 @@
 allow recovery gpu_device:chr_file rw_file_perms;
 
 allow recovery appdomain_tmpfs:file r_file_perms;
-
-allow recovery sysfs_dm:dir r_dir_perms;
-allow recovery sysfs_dm:file r_file_perms;
-
-# TODO: This should really be 'super_block_device', but we can't label
-#       vda both system_block_device and super_block_device..
-allowxperm recovery system_block_device:blk_file ioctl { BLKIOMIN BLKALIGNOFF };
-
-# Copied from update_engine.te:
-# Note: fsetid checks are triggered when creating a file in a directory with
-# the setgid bit set to determine if the file should inherit setgid. In this
-# case, setgid on the file is undesirable so we should just suppress the
-# denial.
-dontaudit recovery self:global_capability_class_set fsetid;