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

Merge changes from topic "catalyst" into main

Browse Source 
* changes:
  [Catalyst] Specify read/write permissions for "Mobile data"
  [Catalyst] Update permission check API signature
This commit is contained in:
Treehugger Robot
2024-12-13 20:57:36 -08:00
committed by Android (Google) Code Review
parent 6a5298ffbf 18ba9d8835
commit 4bfd857a7e
23 changed files with 168 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/com/android/settings/wifi/WifiSwitchPreference.kt
View File

@@ -92,10 +92,15 @@ class WifiSwitchPreference :
return true
}
override fun getReadPermit(context: Context, myUid: Int, callingUid: Int) =
override fun getReadPermit(context: Context, callingPid: Int, callingUid: Int) =
ReadWritePermit.ALLOW
override fun getWritePermit(context: Context, value: Boolean?, myUid: Int, callingUid: Int) =
override fun getWritePermit(
context: Context,
value: Boolean?,
callingPid: Int,
callingUid: Int,
) =
when {
(value == true && !context.isRadioAllowed()) || isSatelliteOn(context) ->
ReadWritePermit.DISALLOW

9
src/com/android/settings/wifi/calling/WifiCallingMainSwitchPreference.kt
View File

@@ -60,10 +60,15 @@ class WifiCallingMainSwitchPreference(private val subId: Int) :
override fun createWidget(context: Context) = SettingsMainSwitchPreference(context)
override fun getReadPermit(context: Context, myUid: Int, callingUid: Int) =
override fun getReadPermit(context: Context, callingPid: Int, callingUid: Int) =
ReadWritePermit.ALLOW
override fun getWritePermit(context: Context, value: Boolean?, myUid: Int, callingUid: Int) =
override fun getWritePermit(
context: Context,
value: Boolean?,
callingPid: Int,
callingUid: Int,
) =
when {
value == true &&
(DisclaimerItemFactory.create(context, subId).isNotEmpty() ||

10
src/com/android/settings/wifi/tether/WifiHotspotSwitchPreference.kt
View File

@@ -106,11 +106,15 @@ class WifiHotspotSwitchPreference(context: Context, dataSaverStore: KeyValueStor
override val restrictionKeys
get() = arrayOf(UserManager.DISALLOW_WIFI_TETHERING)
override fun getReadPermit(context: Context, myUid: Int, callingUid: Int) =
override fun getReadPermit(context: Context, callingPid: Int, callingUid: Int) =
ReadWritePermit.ALLOW
override fun getWritePermit(context: Context, value: Boolean?, myUid: Int, callingUid: Int) =
ReadWritePermit.ALLOW
override fun getWritePermit(
context: Context,
value: Boolean?,
callingPid: Int,
callingUid: Int,
) = ReadWritePermit.ALLOW
override val sensitivityLevel
get() = SensitivityLevel.HIGH_SENSITIVITY