Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Tetiana Meronyk
2024-05-07 17:02:40 +00:00
committed by Android (Google) Code Review
parent 276b1db7b2 4e13fdcd37
commit 6d95ba3664
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/com/android/settings/users/GuestTelephonyPreferenceController.java
View File

@@ -75,6 +75,7 @@ public class GuestTelephonyPreferenceController extends TogglePreferenceControll
super.updateState(preference); super.updateState(preference);
mUserCaps.updateAddUserCapabilities(mContext); mUserCaps.updateAddUserCapabilities(mContext);
preference.setVisible(isAvailable() && mUserCaps.mUserSwitcherEnabled preference.setVisible(isAvailable() && mUserCaps.mUserSwitcherEnabled
&& mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_TELEPHONY)); && mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_TELEPHONY)
&& !UserManager.isHeadlessSystemUserMode());
} }
} }

2
src/com/android/settings/users/UserDetailsSettings.java
View File

@@ -376,7 +376,7 @@ public class UserDetailsSettings extends SettingsPreferenceFragment
if (!Utils.isVoiceCapable(context)) { // no telephony if (!Utils.isVoiceCapable(context)) { // no telephony
removePreference(KEY_ENABLE_TELEPHONY); removePreference(KEY_ENABLE_TELEPHONY);
} }
if (mUserInfo.isMain()) { if (mUserInfo.isMain() || UserManager.isHeadlessSystemUserMode()) {
removePreference(KEY_ENABLE_TELEPHONY); removePreference(KEY_ENABLE_TELEPHONY);
} }
if (mUserInfo.isRestricted()) { if (mUserInfo.isRestricted()) {