Merge "Remove telephony related settings preferences for HSUM devices" into main

This commit is contained in:
Tetiana Meronyk
2024-05-07 17:02:40 +00:00
committed by Android (Google) Code Review
2 changed files with 3 additions and 2 deletions

View File

@@ -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());
}
}

View File

@@ -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()) {