From 4e13fdcd378dc1f55cd0d7fa40446a2343ed75cb Mon Sep 17 00:00:00 2001 From: Tetiana Meronyk Date: Thu, 2 May 2024 11:54:46 +0000 Subject: [PATCH] Remove telephony related settings preferences for HSUM devices Bug: 338358654 Test: atest UserDetailsSettingsTest Change-Id: I53c3a8e4386b5d7738caffb42abf15dd33c360c7 --- .../settings/users/GuestTelephonyPreferenceController.java | 3 ++- src/com/android/settings/users/UserDetailsSettings.java | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/com/android/settings/users/GuestTelephonyPreferenceController.java b/src/com/android/settings/users/GuestTelephonyPreferenceController.java index 83e4bfc5310..4fbd4493bb7 100644 --- a/src/com/android/settings/users/GuestTelephonyPreferenceController.java +++ b/src/com/android/settings/users/GuestTelephonyPreferenceController.java @@ -75,6 +75,7 @@ public class GuestTelephonyPreferenceController extends TogglePreferenceControll super.updateState(preference); mUserCaps.updateAddUserCapabilities(mContext); preference.setVisible(isAvailable() && mUserCaps.mUserSwitcherEnabled - && mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_TELEPHONY)); + && mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_TELEPHONY) + && !UserManager.isHeadlessSystemUserMode()); } } diff --git a/src/com/android/settings/users/UserDetailsSettings.java b/src/com/android/settings/users/UserDetailsSettings.java index a030d865a8b..1f0d824d087 100644 --- a/src/com/android/settings/users/UserDetailsSettings.java +++ b/src/com/android/settings/users/UserDetailsSettings.java @@ -376,7 +376,7 @@ public class UserDetailsSettings extends SettingsPreferenceFragment if (!Utils.isVoiceCapable(context)) { // no telephony removePreference(KEY_ENABLE_TELEPHONY); } - if (mUserInfo.isMain()) { + if (mUserInfo.isMain() || UserManager.isHeadlessSystemUserMode()) { removePreference(KEY_ENABLE_TELEPHONY); } if (mUserInfo.isRestricted()) {