From 9d448b915df7e40b792dbcee14cccee86fa33045 Mon Sep 17 00:00:00 2001
From: Dan Cashman <dcashman@google.com>
Date: Thu, 15 Jun 2017 15:01:21 -0700
Subject: [PATCH] DO NOT MERGE. Restore property to match oc-dev.

CTS checks to make sure that the _contexts files on a device have
a superset of the AOSP entries.  This was removed due to concurrent
master and DR development.  Restore the entry to allow CTS to pass.

Bug: 38241921
Bug: 62348859
Test: Policy builds and is identical to oc-dev for prop ctxts.
Change-Id: I87ccbee7aadee57b8e46ede73280810362b618c0
---
 private/property_contexts | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/private/property_contexts b/private/property_contexts
index 23150343f..4c27b35d6 100644
--- a/private/property_contexts
+++ b/private/property_contexts
@@ -111,3 +111,6 @@ 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
-- 
GitLab