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

Commit 4e561f83 authored by Felipe Leme's avatar Felipe Leme Committed by Android (Google) Code Review
Browse files

Merge "Renamed AUTOFILL_COMPAT_MODE_ALLOWED_PACKAGES." into pi-dev

parents 8055aa24 fd4003bf

api/system-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -4236,7 +4236,7 @@ package android.provider { 
  public static final class Settings.Global extends android.provider.Settings.NameValueTable {

    method public static boolean putString(android.content.ContentResolver, java.lang.String, java.lang.String, java.lang.String, boolean);

    method public static void resetToDefaults(android.content.ContentResolver, java.lang.String);

    field public static final java.lang.String AUTOFILL_COMPAT_ALLOWED_PACKAGES = "autofill_compat_allowed_packages";

    field public static final java.lang.String AUTOFILL_COMPAT_MODE_ALLOWED_PACKAGES = "autofill_compat_mode_allowed_packages";

    field public static final java.lang.String CARRIER_APP_NAMES = "carrier_app_names";

    field public static final java.lang.String CARRIER_APP_WHITELIST = "carrier_app_whitelist";

    field public static final java.lang.String DEFAULT_SM_DP_PLUS = "default_sm_dp_plus";

api/test-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -570,7 +570,7 @@ package android.provider { 
  }



  public static final class Settings.Global extends android.provider.Settings.NameValueTable {

    field public static final java.lang.String AUTOFILL_COMPAT_ALLOWED_PACKAGES = "autofill_compat_allowed_packages";

    field public static final java.lang.String AUTOFILL_COMPAT_MODE_ALLOWED_PACKAGES = "autofill_compat_mode_allowed_packages";

    field public static final java.lang.String HIDDEN_API_BLACKLIST_EXEMPTIONS = "hidden_api_blacklist_exemptions";

    field public static final java.lang.String LOCATION_GLOBAL_KILL_SWITCH = "location_global_kill_switch";

    field public static final java.lang.String LOW_POWER_MODE = "low_power";

core/java/android/provider/Settings.java

+2 −2
Original line number Diff line number Diff line
@@ -11625,8 +11625,8 @@ public final class Settings { 
         */

        @SystemApi

        @TestApi

        public static final String AUTOFILL_COMPAT_ALLOWED_PACKAGES =

                "autofill_compat_allowed_packages";

        public static final String AUTOFILL_COMPAT_MODE_ALLOWED_PACKAGES =

                "autofill_compat_mode_allowed_packages";



        /**

         * Exemptions to the hidden API blacklist.

core/proto/android/providers/settings.proto

+1 −1
Original line number Diff line number Diff line
@@ -466,7 +466,7 @@ message GlobalSettingsProto { 
    // skipped.

    optional SettingProto override_settings_provider_restore_any_version = 355 [ (android.privacy).dest = DEST_AUTOMATIC ];

    optional SettingProto chained_battery_attribution_enabled = 356 [ (android.privacy).dest = DEST_AUTOMATIC ];

    optional SettingProto autofill_compat_allowed_packages = 357 [ (android.privacy).dest = DEST_AUTOMATIC ];

    optional SettingProto autofill_compat_mode_allowed_packages = 357 [ (android.privacy).dest = DEST_AUTOMATIC ];

    optional SettingProto hidden_api_blacklist_exemptions = 358 [ (android.privacy).dest = DEST_AUTOMATIC ];

    optional SettingProto sound_trigger_detection_service_op_timeout = 387  [ (android.privacy).dest = DEST_AUTOMATIC ];

    optional SettingProto max_sound_trigger_detection_service_ops_per_day = 388  [ (android.privacy).dest = DEST_AUTOMATIC ];

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

+1 −1
Original line number Diff line number Diff line
@@ -117,7 +117,7 @@ public class SettingsBackupTest { 
                    Settings.Global.APP_STANDBY_ENABLED,

                    Settings.Global.ASSISTED_GPS_ENABLED,

                    Settings.Global.AUDIO_SAFE_VOLUME_STATE,

                    Settings.Global.AUTOFILL_COMPAT_ALLOWED_PACKAGES,

                    Settings.Global.AUTOFILL_COMPAT_MODE_ALLOWED_PACKAGES,

                    Settings.Global.BATTERY_DISCHARGE_DURATION_THRESHOLD,

                    Settings.Global.BATTERY_DISCHARGE_THRESHOLD,

                    Settings.Global.BATTERY_SAVER_DEVICE_SPECIFIC_CONSTANTS,