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

Commit 86d635cf authored by Abhinav Yadav's avatar Abhinav Yadav Committed by Android (Google) Code Review
Browse files

Merge "Clean up ENABLED_SUBSCRIPTION_FOR_SLOT Settings" into main

parents 13c5e89a a6e67be1

core/java/android/provider/Settings.java

+0 −7
Original line number Diff line number Diff line
@@ -19610,13 +19610,6 @@ public final class Settings { 
        @Readable

        public static final String MULTI_SIM_SMS_PROMPT = "multi_sim_sms_prompt";













        /**













         * Which subscription is enabled for a physical slot.













         * @hide













         */













        @Readable













        public static final String ENABLED_SUBSCRIPTION_FOR_SLOT = "enabled_subscription_for_slot";



























        /**















         * Whether to enable new contacts aggregator or not.















         * The value 1 - enable, 0 - disable

























packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java



+0
−1




























Original line number
Diff line number
Diff line








@@ -544,7 +544,6 @@ public class SettingsBackupTest {













                    Settings.Global.REPAIR_MODE_ACTIVE,















                    Settings.Global.RADIO_BUG_WAKELOCK_TIMEOUT_COUNT_THRESHOLD,















                    Settings.Global.RADIO_BUG_SYSTEM_ERROR_COUNT_THRESHOLD,













                    Settings.Global.ENABLED_SUBSCRIPTION_FOR_SLOT,















                    Settings.Global.POWER_BUTTON_SHORT_PRESS,















                    Settings.Global.POWER_BUTTON_DOUBLE_PRESS,















                    Settings.Global.POWER_BUTTON_TRIPLE_PRESS,