Merge "[Catalyst] Update required permissions for Mobile data" into main

This commit is contained in:
Jacky Wang
2024-12-20 03:37:34 -08:00
committed by Android (Google) Code Review

View File

@@ -48,8 +48,8 @@ class MobileDataPreference :
override fun storage(context: Context): KeyValueStore = MobileDataStorage(context) override fun storage(context: Context): KeyValueStore = MobileDataStorage(context)
override fun getReadPermissions(context: Context) = override fun getReadPermissions(context: Context) =
Permissions.allOf( Permissions.anyOf(
// required by TelephonyManager.isDataEnabledForReason // TelephonyManager.isDataEnabledForReason
Manifest.permission.ACCESS_NETWORK_STATE, Manifest.permission.ACCESS_NETWORK_STATE,
Manifest.permission.READ_PHONE_STATE, Manifest.permission.READ_PHONE_STATE,
Manifest.permission.MODIFY_PHONE_STATE, Manifest.permission.MODIFY_PHONE_STATE,
@@ -58,8 +58,10 @@ class MobileDataPreference :
override fun getWritePermissions(context: Context) = override fun getWritePermissions(context: Context) =
Permissions.allOf( Permissions.allOf(
// required by TelephonyManager.setDataEnabledForReason // SubscriptionManager.createForAllUserProfiles
Manifest.permission.MODIFY_PHONE_STATE Manifest.permission.INTERACT_ACROSS_PROFILES,
// TelephonyManager.setDataEnabledForReason
Manifest.permission.MODIFY_PHONE_STATE,
) )
override fun getReadPermit(context: Context, callingPid: Int, callingUid: Int) = override fun getReadPermit(context: Context, callingPid: Int, callingUid: Int) =