From aede1e304a68afc55fb08e864c1bfcc4832b3143 Mon Sep 17 00:00:00 2001 From: Motomu Utsumi Date: Wed, 11 Jan 2023 07:15:36 +0000 Subject: [PATCH] Re-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. Re-applying the revert as it was not applied to downstream branches, and ended up being lost when they were promoted back to aosp-master. Test: m Bug: 264947218 (cherry picked from commit 78ef4714f58c5d205e6c1775bcd78f2ac4c8df88) Change-Id: I67b914e15a5e149cc608bb37b9d09ed154b58dba --- .../java/com/android/server/am/SettingsToPropertiesMapper.java | 1 - 1 file changed, 1 deletion(-) diff --git a/services/core/java/com/android/server/am/SettingsToPropertiesMapper.java b/services/core/java/com/android/server/am/SettingsToPropertiesMapper.java index 8886f0a06a52a..b8ff26ea3cc9d 100644 --- a/services/core/java/com/android/server/am/SettingsToPropertiesMapper.java +++ b/services/core/java/com/android/server/am/SettingsToPropertiesMapper.java @@ -98,7 +98,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,