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

[Catalyst] Enforce WRITE_SYSTEM_PREFERENCES permission

Browse Source 
Bug: 374115149
Bug: 394744563
Flag: com.android.settingslib.flags.settings_catalyst
Test: manual
Change-Id: I63b84aea001033e81b1d811a2de983d8d107015c
This commit is contained in:
Jacky Wang
2025-02-06 12:22:51 +08:00
parent ec78150e69
commit 68bb5a04c9
3 changed files with 18 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
AndroidManifest.xml
View File

@@ -5515,12 +5515,12 @@
android:exported="true" android:exported="true"
android:permission="android.permission.BLUETOOTH_PRIVILEGED" /> android:permission="android.permission.BLUETOOTH_PRIVILEGED" />
<!-- Once b/364771256 is fixed, add android:featureFlag="com.android.settings.flags.catalyst_service". --> <!-- Service based on settingslib ipc to expose Preference Metadata and Get/Set functionality. -->
<!-- Permission is not yet finalized, use READ_BASIC_PHONE_STATE temporarily. -->
<service <service
android:name=".SettingsService" android:name=".SettingsService"
android:exported="true" android:exported="true"
android:permission="android.permission.READ_BASIC_PHONE_STATE"> android:featureFlag="com.android.settings.flags.catalyst_service"
android:permission="android.permission.READ_SYSTEM_PREFERENCES">
<intent-filter> <intent-filter>
<action android:name="com.android.settingslib.PREFERENCE_SERVICE" /> <action android:name="com.android.settingslib.PREFERENCE_SERVICE" />
</intent-filter> </intent-filter>

14
src/com/android/settings/SettingsService.kt
View File

@@ -16,21 +16,19 @@
package com.android.settings package com.android.settings
import android.content.Intent import android.Manifest.permission.WRITE_SYSTEM_PREFERENCES
import com.android.settings.flags.Flags import android.app.AppOpsManager.OP_WRITE_SYSTEM_PREFERENCES
import com.android.settings.metrics.SettingsRemoteOpMetricsLogger import com.android.settings.metrics.SettingsRemoteOpMetricsLogger
import com.android.settingslib.ipc.ApiPermissionChecker import com.android.settingslib.ipc.ApiPermissionChecker
import com.android.settingslib.ipc.AppOpApiPermissionChecker
import com.android.settingslib.service.PreferenceService import com.android.settingslib.service.PreferenceService
/** Service to expose settings APIs. */ /** Service to expose settings APIs. */
class SettingsService : class SettingsService :
PreferenceService( PreferenceService(
graphPermissionChecker = ApiPermissionChecker.alwaysAllow(), graphPermissionChecker = ApiPermissionChecker.alwaysAllow(),
setterPermissionChecker = ApiPermissionChecker.alwaysAllow(), setterPermissionChecker =
AppOpApiPermissionChecker(OP_WRITE_SYSTEM_PREFERENCES, WRITE_SYSTEM_PREFERENCES),
getterPermissionChecker = ApiPermissionChecker.alwaysAllow(), getterPermissionChecker = ApiPermissionChecker.alwaysAllow(),
metricsLogger = SettingsRemoteOpMetricsLogger(), metricsLogger = SettingsRemoteOpMetricsLogger(),
) { )
override fun onBind(intent: Intent) =
if (Flags.catalystService()) super.onBind(intent) else null
}

10
src/com/android/settings/service/PreferenceService.kt
View File

@@ -16,6 +16,8 @@
package com.android.settings.service package com.android.settings.service
import android.Manifest.permission.WRITE_SYSTEM_PREFERENCES
import android.app.AppOpsManager.OP_WRITE_SYSTEM_PREFERENCES
import android.os.Binder import android.os.Binder
import android.os.OutcomeReceiver import android.os.OutcomeReceiver
import android.service.settings.preferences.GetValueRequest import android.service.settings.preferences.GetValueRequest
@@ -32,6 +34,7 @@ import com.android.settingslib.graph.PreferenceGetterApiHandler
import com.android.settingslib.graph.PreferenceGetterFlags import com.android.settingslib.graph.PreferenceGetterFlags
import com.android.settingslib.graph.PreferenceSetterApiHandler import com.android.settingslib.graph.PreferenceSetterApiHandler
import com.android.settingslib.ipc.ApiPermissionChecker import com.android.settingslib.ipc.ApiPermissionChecker
import com.android.settingslib.ipc.AppOpApiPermissionChecker
import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.SupervisorJob import kotlinx.coroutines.SupervisorJob
@@ -47,10 +50,15 @@ class PreferenceService : SettingsPreferenceService() {
init { init {
val metricsLogger = SettingsRemoteOpMetricsLogger() val metricsLogger = SettingsRemoteOpMetricsLogger()
// PreferenceService specifies READ_SYSTEM_PREFERENCES permission in AndroidManifest.xml
getApiHandler = getApiHandler =
PreferenceGetterApiHandler(1, ApiPermissionChecker.alwaysAllow(), metricsLogger) PreferenceGetterApiHandler(1, ApiPermissionChecker.alwaysAllow(), metricsLogger)
setApiHandler = setApiHandler =
PreferenceSetterApiHandler(2, ApiPermissionChecker.alwaysAllow(), metricsLogger) PreferenceSetterApiHandler(
2,
AppOpApiPermissionChecker(OP_WRITE_SYSTEM_PREFERENCES, WRITE_SYSTEM_PREFERENCES),
metricsLogger,
)
graphApi = graphApi =
GetPreferenceGraphApiHandler(3, ApiPermissionChecker.alwaysAllow(), metricsLogger) GetPreferenceGraphApiHandler(3, ApiPermissionChecker.alwaysAllow(), metricsLogger)
} }