summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Motomu Utsumi <motomuman@google.com> 2023-01-11 07:15:36 +0000
committer Cherrypicker Worker <android-build-cherrypicker-worker@google.com> 2023-01-12 08:12:18 +0000
commit8193b4bf8fea5661931b1631ef2ba1420e73fc8d (patch)
tree7440fcf333041a6b7c169aa08d6f3fc8c6c531ca
parentc49d109fa6c47fa602b28c18609b15cc60365a25 (diff)
Revert "Enable tethering namespace accessible in Android native level."
This reverts commit 32bd9d6d0563482d98624f046a979622b1618f50. Reason for revert: Original commit was for native experiment setup. But SEPolicy was not updated and sync to native level always fail in T devices. This CL will clean up incomplete native experiment setup. Even if we decide that we want to use flags from native code in the Tethering module, we will do so using a new namespace, tethering_u_plus_native. Test: m Bug: 264947218 Change-Id: If32fe0b237dcb213886efb72430ea7575ab64530 (cherry picked from commit 78ef4714f58c5d205e6c1775bcd78f2ac4c8df88) Merged-In: If32fe0b237dcb213886efb72430ea7575ab64530
-rw-r--r--services/core/java/com/android/server/am/SettingsToPropertiesMapper.java1
1 files changed, 0 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/am/SettingsToPropertiesMapper.java b/services/core/java/com/android/server/am/SettingsToPropertiesMapper.java
index 17cd5d158f2d..6562ae70bc19 100644
--- a/services/core/java/com/android/server/am/SettingsToPropertiesMapper.java
+++ b/services/core/java/com/android/server/am/SettingsToPropertiesMapper.java
@@ -97,7 +97,6 @@ public class SettingsToPropertiesMapper {
DeviceConfig.NAMESPACE_STORAGE_NATIVE_BOOT,
DeviceConfig.NAMESPACE_SURFACE_FLINGER_NATIVE_BOOT,
DeviceConfig.NAMESPACE_SWCODEC_NATIVE,
- DeviceConfig.NAMESPACE_TETHERING,
DeviceConfig.NAMESPACE_VENDOR_SYSTEM_NATIVE,
DeviceConfig.NAMESPACE_VENDOR_SYSTEM_NATIVE_BOOT,
DeviceConfig.NAMESPACE_VIRTUALIZATION_FRAMEWORK_NATIVE,