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

Revert "[Catalyst] Add settings service"

Browse Source 
Revert submission 29815608-catalyst

Reason for revert: Likely culprit for b/373339105  - verifying through ABTD before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted.

Reverted changes: /q/submissionid:29815608-catalyst

Change-Id: If42ddb09c07da5672c3d55c2517b75647ea77ae5
This commit is contained in:
Chaitanya Cheemala (xWF)
2024-10-14 14:18:07 +00:00
committed by Android (Google) Code Review
parent 92354f8bed
commit eafda3c490
4 changed files with 0 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Android.bp
View File

@@ -98,7 +98,6 @@ android_library {
"SettingsLibDataStore", "SettingsLibDataStore",
"SettingsLibMetadata", "SettingsLibMetadata",
"SettingsLibPreference", "SettingsLibPreference",
"SettingsLibService",
"aconfig_settings_flags_lib", "aconfig_settings_flags_lib",
"accessibility_settings_flags_lib", "accessibility_settings_flags_lib",
"contextualcards", "contextualcards",

11
AndroidManifest.xml
View File

@@ -5299,17 +5299,6 @@
android:enabled="true" android:enabled="true"
android:exported="false" /> android:exported="false" />
<!-- Once b/364771256 is fixed, add android:featureFlag="com.android.settings.flags.catalyst_service". -->
<!-- Permission is not yet finalized, use READ_BASIC_PHONE_STATE temporarily. -->
<service
android:name=".SettingsService"
android:exported="true"
android:permission="android.permission.READ_BASIC_PHONE_STATE">
<intent-filter>
<action android:name="com.android.settingslib.PREFERENCE_SERVICE" />
</intent-filter>
</service>
<receiver android:name="com.android.settings.connecteddevice.audiosharing.AudioSharingReceiver" <receiver android:name="com.android.settings.connecteddevice.audiosharing.AudioSharingReceiver"
android:exported="false"> android:exported="false">
<intent-filter> <intent-filter>

7
aconfig/settings_flag_declarations.aconfig
View File

@@ -63,10 +63,3 @@ flag {
description: "Flag for all screens" description: "Flag for all screens"
bug: "323791114" bug: "323791114"
} }
flag {
name: "catalyst_service"
namespace: "android_settings"
description: "Flag for catalyst service"
bug: "323791114"
}

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

@@ -1,30 +0,0 @@
/*
* Copyright (C) 2024 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.android.settings
import android.content.Intent
import android.os.IBinder
import com.android.settings.flags.Flags
import com.android.settingslib.service.PreferenceService
/** Service to expose settings APIs. */
class SettingsService : PreferenceService({ _, _, _ -> true }) {
override fun onBind(intent: Intent): IBinder? {
return if (!Flags.catalystService()) null else super.onBind(intent)
}
}