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

Commit 6d48aa98 authored by Ajay Panicker's avatar Ajay Panicker Committed by Android (Google) Code Review
Browse files

Merge "resolve merge conflicts of 06b8324d to master"

parents 2f96131e 0a3411a2

core/java/android/provider/Settings.java

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

        public static final String AUTOFILL_SERVICE = "autofill_service";



        /**

         * bluetooth HCI snoop log configuration

         * @hide

         */

        public static final String BLUETOOTH_HCI_LOG =

                "bluetooth_hci_log";



        /**

         * @deprecated Use {@link android.provider.Settings.Global#DEVICE_PROVISIONED} instead

         */

core/tests/coretests/src/android/provider/SettingsBackupTest.java

+0 −1
Original line number Diff line number Diff line
@@ -407,7 +407,6 @@ public class SettingsBackupTest { 
                 Settings.Secure.BACKUP_ENABLED,

                 Settings.Secure.BACKUP_PROVISIONED,

                 Settings.Secure.BACKUP_TRANSPORT,

                 Settings.Secure.BLUETOOTH_HCI_LOG,

                 Settings.Secure.CAMERA_LIFT_TRIGGER_ENABLED, // Candidate for backup?

                 Settings.Secure.CARRIER_APPS_HANDLED,

                 Settings.Secure.CMAS_ADDITIONAL_BROADCAST_PKG,

packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java

+0 −3
Original line number Diff line number Diff line
@@ -984,9 +984,6 @@ class SettingsProtoDumpUtil { 
        dumpSetting(s, p,

                Settings.Secure.AUTOFILL_SERVICE,

                SecureSettingsProto.AUTOFILL_SERVICE);

        dumpSetting(s, p,

                Settings.Secure.BLUETOOTH_HCI_LOG,

                SecureSettingsProto.BLUETOOTH_HCI_LOG);

        dumpSetting(s, p,

                Settings.Secure.USER_SETUP_COMPLETE,

                SecureSettingsProto.USER_SETUP_COMPLETE);