Initial unified commit for Android 11, syncing up to v311

patches_treble/system_sepolicy/0001-Revert-sepolicy-Relabel-wifi.-properties-as-wifi_pro.patch

@@ -0,0 +1,42 @@
+From f12f94ae51ec13744bd2f93585ce744128ee192f Mon Sep 17 00:00:00 2001
+From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
+Date: Mon, 5 Oct 2020 01:29:18 +0000
+Subject: [PATCH] Revert "sepolicy: Relabel wifi. properties as wifi_prop"
+
+This reverts commit bf52f194873840546c996c232eb44c8427ddcd5c.
+
+Change-Id: I0446540331684eb57f7e17bcc3273d6247915854
+---
+ private/property_contexts | 1 -
+ private/system_server.te  | 3 ---
+ 2 files changed, 4 deletions(-)
+
+diff --git a/private/property_contexts b/private/property_contexts
+index a4fab1f22..cf0a2dee5 100644
+--- a/private/property_contexts
++++ b/private/property_contexts
+@@ -171,7 +171,6 @@ dalvik.                 u:object_r:dalvik_prop:s0
+ ro.dalvik.              u:object_r:dalvik_prop:s0
+ 
+ # Shared between system server and wificond
+-wifi.                   u:object_r:wifi_prop:s0
+ wlan.                   u:object_r:wifi_prop:s0
+ 
+ # Lowpan properties
+diff --git a/private/system_server.te b/private/system_server.te
+index 3c1d192d7..b63b47d3d 100644
+--- a/private/system_server.te
++++ b/private/system_server.te
+@@ -676,9 +676,6 @@ get_prop(system_server, mock_ota_prop)
+ # Read the property as feature flag for protecting apks with fs-verity.
+ get_prop(system_server, apk_verity_prop)
+ 
+-# Read wifi.interface
+-get_prop(system_server, wifi_prop)
+-
+ # Read the vendor property that indicates if Incremental features is enabled
+ get_prop(system_server, incremental_prop)
+ 
+-- 
+2.25.1
+