Merge "Sepolicy: Give asan_extract access to powerctl"

prebuilts/api/26.0/26.0.cil

@@ -2,6 +2,7 @@
 (typeattributeset domain_deprecated (bluetooth_26_0))
 
 ;; types removed from current policy
+(type asan_reboot_prop)
 (type log_device)
 
 (typeattributeset accessibility_service_26_0 (accessibility_service))

private/property_contexts

@@ -112,6 +112,3 @@ wlan.                   u:object_r:wifi_prop:s0
 
 # hwservicemanager properties
 hwservicemanager.       u:object_r:hwservicemanager_prop:s0
-
-# ASAN install trigger
-asan.restore_reboot  u:object_r:asan_reboot_prop:s0

public/asan_extract.te

@@ -31,10 +31,6 @@ with_asan(`
   # Restorecon will actually already try to run with sanitized libraries (libpackagelistparser).
   allow asan_extract system_data_file:file execute;
 
-  # TODO - remove (b/38241921):
-  # We use asan.restore_reboot to signal a reboot is required.
-  set_prop(asan_extract, asan_reboot_prop)
-
-  # We need to signal a reboot when done
+  # We need to signal a reboot when done.
   set_prop(asan_extract, powerctl_prop)
 ')

public/property.te

-type asan_reboot_prop, property_type; # TODO - remove (b/38241921)
 type audio_prop, property_type, core_property_type;
 type boottime_prop, property_type;
 type bluetooth_prop, property_type;