Initial unified commit for Android 12, syncing up to v400.a
This commit is contained in:
@@ -0,0 +1,42 @@
|
||||
From ce636dec0d85d9b74352a4defab35697ceffbf5d 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 4cec7348d..349e93141 100644
|
||||
--- a/private/property_contexts
|
||||
+++ b/private/property_contexts
|
||||
@@ -201,7 +201,6 @@ qemu.hw.mainkeys u:object_r:qemu_hw_prop:s0 exact string
|
||||
qemu.sf.lcd_density u:object_r:qemu_sf_lcd_density_prop:s0 exact int
|
||||
|
||||
# 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 73301c1e9..befe6814e 100644
|
||||
--- a/private/system_server.te
|
||||
+++ b/private/system_server.te
|
||||
@@ -748,9 +748,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
|
||||
|
||||
Reference in New Issue
Block a user