[Catalyst] Update permission check API signature

NO_IFTTT=Catalyst only

Bug: 374115149
Flag: com.android.settings.flags.catalyst
Test: manual
Change-Id: Ib13a5fddd517e3e260815b753b55c008e24d70d8

src/com/android/settings/SettingsService.kt

@@ -41,7 +41,7 @@ private class SetterPermissionChecker : ApiPermissionChecker<PreferenceSetterReq
 
     override fun hasPermission(
         application: Application,
-        myUid: Int,
+        callingPid: Int,
         callingUid: Int,
         request: PreferenceSetterRequest,
     ) = true
@@ -52,7 +52,7 @@ private class GetterPermissionChecker : ApiPermissionChecker<PreferenceGetterReq
 
     override fun hasPermission(
         application: Application,
-        myUid: Int,
+        callingPid: Int,
         callingUid: Int,
         request: PreferenceGetterRequest,
     ) = true

src/com/android/settings/accessibility/RemoveAnimationsPreference.kt

@@ -65,11 +65,15 @@ class RemoveAnimationsPreference :
 
     override fun storage(context: Context): KeyValueStore = RemoveAnimationsStorage(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(
-        ReadWritePermit.ALLOW
+        context: Context,
+        value: Boolean?,
+        callingPid: Int,
+        callingUid: Int,
+    ) = ReadWritePermit.ALLOW
 
     override val sensitivityLevel
         get() = SensitivityLevel.NO_SENSITIVITY

src/com/android/settings/accessibility/VibrationMainSwitchPreference.kt

@@ -30,16 +30,16 @@ import com.android.settingslib.metadata.MainSwitchPreference
 import com.android.settingslib.metadata.PreferenceLifecycleContext
 import com.android.settingslib.metadata.PreferenceLifecycleProvider
 import com.android.settingslib.metadata.ReadWritePermit
-import com.android.settingslib.preference.MainSwitchPreferenceBinding
 
-/**
+/** Accessibility settings for vibration. */
- * Accessibility settings for vibration.
- */
 // LINT.IfChange
-class VibrationMainSwitchPreference : MainSwitchPreference(
+class VibrationMainSwitchPreference :
-    key = Settings.System.VIBRATE_ON,
+    MainSwitchPreference(
-    title = R.string.accessibility_vibration_primary_switch_title,
+        key = Settings.System.VIBRATE_ON,
-), PreferenceLifecycleProvider, OnCheckedChangeListener {
+        title = R.string.accessibility_vibration_primary_switch_title,
+    ),
+    PreferenceLifecycleProvider,
+    OnCheckedChangeListener {
     override val keywords: Int
         get() = R.string.keywords_accessibility_vibration_primary_switch
 
@@ -48,20 +48,26 @@ class VibrationMainSwitchPreference : MainSwitchPreference(
     override fun storage(context: Context): KeyValueStore =
         VibrationMainSwitchToggleStorage(SettingsSystemStore.get(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(
-        ReadWritePermit.ALLOW
+        context: Context,
+        value: Boolean?,
+        callingPid: Int,
+        callingUid: Int,
+    ) = ReadWritePermit.ALLOW
 
     override fun onResume(context: PreferenceLifecycleContext) {
         vibrator = context.getSystemService(Vibrator::class.java)
-        context.findPreference<com.android.settingslib.widget.MainSwitchPreference>(key)
+        context
+            .findPreference<com.android.settingslib.widget.MainSwitchPreference>(key)
             ?.addOnSwitchChangeListener(this)
     }
 
     override fun onPause(context: PreferenceLifecycleContext) {
-        context.findPreference<com.android.settingslib.widget.MainSwitchPreference>(key)
+        context
+            .findPreference<com.android.settingslib.widget.MainSwitchPreference>(key)
             ?.removeOnSwitchChangeListener(this)
     }
 
@@ -69,16 +75,16 @@ class VibrationMainSwitchPreference : MainSwitchPreference(
         if (isChecked) {
             // Play a haptic as preview for the main toggle only when touch feedback is enabled.
             VibrationPreferenceConfig.playVibrationPreview(
-                vibrator, VibrationAttributes.USAGE_TOUCH
+                vibrator,
+                VibrationAttributes.USAGE_TOUCH,
             )
         }
     }
 
     /** Provides SettingsStore for vibration main switch with custom default value. */
     @Suppress("UNCHECKED_CAST")
-    private class VibrationMainSwitchToggleStorage(
+    private class VibrationMainSwitchToggleStorage(private val settingsStore: SettingsStore) :
-        private val settingsStore: SettingsStore,
+        KeyedObservableDelegate<String>(settingsStore), KeyValueStore {
-    ) : KeyedObservableDelegate<String>(settingsStore), KeyValueStore {
 
         override fun contains(key: String) = settingsStore.contains(key)
 

src/com/android/settings/connecteddevice/BluetoothPreference.kt

@@ -52,10 +52,15 @@ class BluetoothPreference(private val bluetoothDataStore: BluetoothDataStore) :
     override val restrictionKeys: Array<String>
         get() = arrayOf(UserManager.DISALLOW_BLUETOOTH, UserManager.DISALLOW_CONFIG_BLUETOOTH)
 
-    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 {
             isSatelliteOn(context, 3000) ||
                 (value == true &&

src/com/android/settings/datausage/DataSaverMainSwitchPreference.kt

@@ -36,11 +36,15 @@ class DataSaverMainSwitchPreference : MainSwitchBarMetadata, PreferenceLifecycle
 
     override fun storage(context: Context) = createDataStore(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(
-        ReadWritePermit.ALLOW
+        context: Context,
+        value: Boolean?,
+        callingPid: Int,
+        callingUid: Int,
+    ) = ReadWritePermit.ALLOW
 
     override val sensitivityLevel
         get() = SensitivityLevel.NO_SENSITIVITY

src/com/android/settings/display/AdaptiveSleepPreference.kt

@@ -77,11 +77,15 @@ class AdaptiveSleepPreference :
 
     override fun storage(context: Context): KeyValueStore = Storage(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(
-        ReadWritePermit.ALLOW
+        context: Context,
+        value: Boolean?,
+        callingPid: Int,
+        callingUid: Int,
+    ) = ReadWritePermit.ALLOW
 
     override val sensitivityLevel
         get() = SensitivityLevel.NO_SENSITIVITY

src/com/android/settings/display/AmbientDisplayAlwaysOnPreference.kt

@@ -71,11 +71,15 @@ class AmbientDisplayAlwaysOnPreference :
 
     override fun storage(context: Context): KeyValueStore = Storage(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(
-        ReadWritePermit.ALLOW
+        context: Context,
+        value: Boolean?,
+        callingPid: Int,
+        callingUid: Int,
+    ) = ReadWritePermit.ALLOW
 
     override val sensitivityLevel
         get() = SensitivityLevel.NO_SENSITIVITY

src/com/android/settings/display/AutoBrightnessScreen.kt

@@ -65,11 +65,15 @@ class AutoBrightnessScreen :
     override fun storage(context: Context): KeyValueStore =
         AutoBrightnessDataStore(SettingsSystemStore.get(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(
-        ReadWritePermit.ALLOW
+        context: Context,
+        value: Boolean?,
+        callingPid: Int,
+        callingUid: Int,
+    ) = ReadWritePermit.ALLOW
 
     override val sensitivityLevel
         get() = SensitivityLevel.NO_SENSITIVITY

src/com/android/settings/display/BatteryPercentageSwitchPreference.kt

@@ -49,11 +49,15 @@ class BatteryPercentageSwitchPreference :
                 com.android.internal.R.bool.config_battery_percentage_setting_available
             )
 
-    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(
-        ReadWritePermit.ALLOW
+        context: Context,
+        value: Boolean?,
+        callingPid: Int,
+        callingUid: Int,
+    ) = ReadWritePermit.ALLOW
 
     override val sensitivityLevel
         get() = SensitivityLevel.NO_SENSITIVITY

src/com/android/settings/display/PeakRefreshRateSwitchPreference.kt

@@ -50,11 +50,15 @@ class PeakRefreshRateSwitchPreference :
     override fun storage(context: Context): KeyValueStore =
         PeakRefreshRateStore(context, SettingsSystemStore.get(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(
-        ReadWritePermit.ALLOW
+        context: Context,
+        value: Boolean?,
+        callingPid: Int,
+        callingUid: Int,
+    ) = ReadWritePermit.ALLOW
 
     override val sensitivityLevel
         get() = SensitivityLevel.NO_SENSITIVITY

src/com/android/settings/display/darkmode/DarkModeScreen.kt

@@ -71,11 +71,15 @@ class DarkModeScreen :
     override val keywords: Int
         get() = R.string.keywords_dark_ui_mode
 
-    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(
-        ReadWritePermit.ALLOW
+        context: Context,
+        value: Boolean?,
+        callingPid: Int,
+        callingUid: Int,
+    ) = ReadWritePermit.ALLOW
 
     override val sensitivityLevel
         get() = SensitivityLevel.NO_SENSITIVITY

src/com/android/settings/fuelgauge/BatteryHeaderPreference.kt

@@ -102,10 +102,10 @@ class BatteryHeaderPreference :
 
     override fun getMaxValue(context: Context): Int = 100
 
-    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: Int?, myUid: Int, callingUid: Int) =
+    override fun getWritePermit(context: Context, value: Int?, callingPid: Int, callingUid: Int) =
         ReadWritePermit.DISALLOW
 
     companion object {

src/com/android/settings/fuelgauge/batterysaver/BatterySaverPreference.kt

@@ -43,11 +43,15 @@ class BatterySaverPreference :
 
     override fun storage(context: Context) = BatterySaverStore(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(
-        ReadWritePermit.ALLOW
+        context: Context,
+        value: Boolean?,
+        callingPid: Int,
+        callingUid: Int,
+    ) = ReadWritePermit.ALLOW
 
     override val sensitivityLevel
         get() = SensitivityLevel.NO_SENSITIVITY

src/com/android/settings/network/AdaptiveConnectivityTogglePreference.kt

@@ -35,11 +35,15 @@ class AdaptiveConnectivityTogglePreference :
     override fun storage(context: Context): KeyValueStore =
         AdaptiveConnectivityToggleStorage(context, SettingsSecureStore.get(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(
-        ReadWritePermit.ALLOW
+        context: Context,
+        value: Boolean?,
+        callingPid: Int,
+        callingUid: Int,
+    ) = ReadWritePermit.ALLOW
 
     override val sensitivityLevel
         get() = SensitivityLevel.NO_SENSITIVITY

src/com/android/settings/network/AirplaneModePreference.kt

@@ -65,10 +65,15 @@ class AirplaneModePreference :
     override val restrictionKeys
         get() = arrayOf(UserManager.DISALLOW_AIRPLANE_MODE)
 
-    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 {
             isSatelliteOn(context) || isInEcmMode(context) -> ReadWritePermit.DISALLOW
             else -> ReadWritePermit.ALLOW

src/com/android/settings/network/MobileDataPreference.kt

@@ -45,11 +45,15 @@ class MobileDataPreference :
 
     override fun storage(context: Context): KeyValueStore = MobileDataStorage(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(
-        ReadWritePermit.ALLOW
+        context: Context,
+        value: Boolean?,
+        callingPid: Int,
+        callingUid: Int,
+    ) = ReadWritePermit.ALLOW
 
     override val sensitivityLevel
         get() = SensitivityLevel.LOW_SENSITIVITY

src/com/android/settings/network/tether/BluetoothTetherSwitchPreference.kt

@@ -77,11 +77,15 @@ class BluetoothTetherSwitchPreference :
         return !dataSaverBackend.isDataSaverEnabled
     }
 
-    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(
-        ReadWritePermit.ALLOW
+        context: Context,
+        value: Boolean?,
+        callingPid: Int,
+        callingUid: Int,
+    ) = ReadWritePermit.ALLOW
 
     override val sensitivityLevel: Int
         get() = SensitivityLevel.LOW_SENSITIVITY

src/com/android/settings/notification/CallVolumePreference.kt

@@ -76,10 +76,10 @@ open class CallVolumePreference :
         }
     }
 
-    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: Int?, myUid: Int, callingUid: Int) =
+    override fun getWritePermit(context: Context, value: Int?, callingPid: Int, callingUid: Int) =
         ReadWritePermit.ALLOW
 
     override val sensitivityLevel

src/com/android/settings/notification/MediaVolumePreference.kt

@@ -77,10 +77,10 @@ open class MediaVolumePreference :
         }
     }
 
-    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: Int?, myUid: Int, callingUid: Int) =
+    override fun getWritePermit(context: Context, value: Int?, callingPid: Int, callingUid: Int) =
         ReadWritePermit.ALLOW
 
     override val sensitivityLevel

src/com/android/settings/notification/SeparateRingVolumePreference.kt

@@ -94,10 +94,10 @@ open class SeparateRingVolumePreference :
         }
     }
 
-    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: Int?, myUid: Int, callingUid: Int) =
+    override fun getWritePermit(context: Context, value: Int?, callingPid: Int, callingUid: Int) =
         ReadWritePermit.ALLOW
 
     override val sensitivityLevel

src/com/android/settings/wifi/WifiSwitchPreference.kt

@@ -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

src/com/android/settings/wifi/calling/WifiCallingMainSwitchPreference.kt

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

src/com/android/settings/wifi/tether/WifiHotspotSwitchPreference.kt

@@ -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) =
+    override fun getWritePermit(
-        ReadWritePermit.ALLOW
+        context: Context,
+        value: Boolean?,
+        callingPid: Int,
+        callingUid: Int,
+    ) = ReadWritePermit.ALLOW
 
     override val sensitivityLevel
         get() = SensitivityLevel.HIGH_SENSITIVITY