PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge changes from topic "settings-visibility-return-fixes" into main

Browse Source 
* changes:
  Return DISABLED_FOR_USER in deviceinfo/simstatus availability if not admin user
  Return UNSUPPORTED_ON_DEVICE in deviceinfo/simstatus when no telephony
  Added unit tests for SimStatusPreferenceController visibility
  Return DISABLED_FOR_USER in IMEI availability if not admin user
  Return UNSUPPORTED_ON_DEVICE in network/imei when no telephony
  Added unit test for MobileNetworkImeiPreferenceController visibility
  Added unit tests for ImeiInfoPreferenceController visibility
  Return UNSUPPORTED_ON_DEVICE in network/phonenumber when no telephony
This commit is contained in:
Aleksander Morgado
2025-02-18 00:10:26 -08:00
committed by Android (Google) Code Review
parent faabe07453 22c8840526
commit c9aaa03d7b
8 changed files with 168 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/com/android/settings/network/telephony/MobileNetworkImeiPreferenceController.kt
View File

@@ -64,12 +64,12 @@ class MobileNetworkImeiPreferenceController(context: Context, key: String) :
}
override fun getAvailabilityStatus(subId: Int): Int = when {
!Flags.isDualSimOnboardingEnabled() -> CONDITIONALLY_UNAVAILABLE
SubscriptionManager.isValidSubscriptionId(subId)
&& SubscriptionUtil.isSimHardwareVisible(mContext)
&& mContext.userManager.isAdminUser
&& !Utils.isWifiOnly(mContext) -> AVAILABLE
else -> CONDITIONALLY_UNAVAILABLE
!SubscriptionUtil.isSimHardwareVisible(mContext)
|| Utils.isWifiOnly(mContext) -> UNSUPPORTED_ON_DEVICE
!Flags.isDualSimOnboardingEnabled()
|| !SubscriptionManager.isValidSubscriptionId(subId) -> CONDITIONALLY_UNAVAILABLE
!mContext.userManager.isAdminUser -> DISABLED_FOR_USER
else -> AVAILABLE
}
override fun displayPreference(screen: PreferenceScreen) {

6
src/com/android/settings/network/telephony/MobileNetworkPhoneNumberPreferenceController.kt
View File

@@ -44,10 +44,10 @@ constructor(
}
override fun getAvailabilityStatus(subId: Int): Int = when {
!SubscriptionUtil.isSimHardwareVisible(mContext)
|| Utils.isWifiOnly(mContext) -> UNSUPPORTED_ON_DEVICE
!Flags.isDualSimOnboardingEnabled()
|| !SubscriptionManager.isValidSubscriptionId(subId)
|| !SubscriptionUtil.isSimHardwareVisible(mContext)
|| Utils.isWifiOnly(mContext) -> CONDITIONALLY_UNAVAILABLE
|| !SubscriptionManager.isValidSubscriptionId(subId) -> CONDITIONALLY_UNAVAILABLE
!mContext.userManager.isAdminUser -> DISABLED_FOR_USER
else -> AVAILABLE
}