Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit eafda3c4 authored by Chaitanya Cheemala (xWF)'s avatar Chaitanya Cheemala (xWF) Committed by Android (Google) Code Review
Browse files

Revert "[Catalyst] Add settings service" 

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
parent 92354f8b

Android.bp

+0 −1
Original line number Diff line number Diff line
@@ -98,7 +98,6 @@ android_library { 
        "SettingsLibDataStore",

        "SettingsLibMetadata",

        "SettingsLibPreference",

        "SettingsLibService",

        "aconfig_settings_flags_lib",

        "accessibility_settings_flags_lib",

        "contextualcards",

AndroidManifest.xml

+0 −11
Original line number Diff line number Diff line
@@ -5299,17 +5299,6 @@ 
            android:enabled="true"

            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"

            android:exported="false">

            <intent-filter>

aconfig/settings_flag_declarations.aconfig

+0 −7
Original line number Diff line number Diff line
@@ -63,10 +63,3 @@ flag { 
  description: "Flag for all screens"

  bug: "323791114"

}
 


flag {

  name: "catalyst_service"

  namespace: "android_settings"

  description: "Flag for catalyst service"

  bug: "323791114"

}

src/com/android/settings/SettingsService.kt

deleted100644 → 0
+0 −30
Original line number Diff line number Diff line 
/*

 * 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)

    }

}