From fd4003bf0949a4a33200621d0c6f33dbebfa14d3 Mon Sep 17 00:00:00 2001 From: Felipe Leme Date: Tue, 20 Mar 2018 17:12:17 -0700 Subject: [PATCH] Renamed AUTOFILL_COMPAT_MODE_ALLOWED_PACKAGES. The syntax of that setting changed from P Developer Preview1 to the final P, so it's safer to use a new name than risk breaking devices during the update. Bug: 74458004 Test: atest CtsAutoFillServiceTestCases:VirtualContainerActivityCompatModeTest\ FrameworksCoreTests:SettingsBackupTest Change-Id: I1c507e8eae20f598dfe259178667ae6c2bc892ff --- api/system-current.txt | 2 +- api/test-current.txt | 2 +- core/java/android/provider/Settings.java | 4 ++-- core/proto/android/providers/settings.proto | 2 +- .../coretests/src/android/provider/SettingsBackupTest.java | 2 +- .../com/android/providers/settings/SettingsProtoDumpUtil.java | 4 ++-- .../com/android/server/autofill/AutofillManagerService.java | 4 ++-- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/api/system-current.txt b/api/system-current.txt index a5be12fdfc9cc..f54c769a2d656 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -4232,7 +4232,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"; diff --git a/api/test-current.txt b/api/test-current.txt index 70e3cf34f6b04..31e3e7c242fea 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -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"; diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index b9aad113c6777..13e9625f8b528 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -11594,8 +11594,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. diff --git a/core/proto/android/providers/settings.proto b/core/proto/android/providers/settings.proto index 4e781d67d6938..4bb970799b182 100644 --- a/core/proto/android/providers/settings.proto +++ b/core/proto/android/providers/settings.proto @@ -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 ]; diff --git a/core/tests/coretests/src/android/provider/SettingsBackupTest.java b/core/tests/coretests/src/android/provider/SettingsBackupTest.java index 2036e2f95225b..d5b1f95b67c5f 100644 --- a/core/tests/coretests/src/android/provider/SettingsBackupTest.java +++ b/core/tests/coretests/src/android/provider/SettingsBackupTest.java @@ -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, diff --git a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java index 34aae4953d9da..797b4f9fa9d59 100644 --- a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java +++ b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java @@ -1158,8 +1158,8 @@ class SettingsProtoDumpUtil { Global.CHAINED_BATTERY_ATTRIBUTION_ENABLED, GlobalSettingsProto.CHAINED_BATTERY_ATTRIBUTION_ENABLED); dumpSetting(s, p, - Settings.Global.AUTOFILL_COMPAT_ALLOWED_PACKAGES, - GlobalSettingsProto.AUTOFILL_COMPAT_ALLOWED_PACKAGES); + Settings.Global.AUTOFILL_COMPAT_MODE_ALLOWED_PACKAGES, + GlobalSettingsProto.AUTOFILL_COMPAT_MODE_ALLOWED_PACKAGES); dumpSetting(s, p, Global.HIDDEN_API_BLACKLIST_EXEMPTIONS, GlobalSettingsProto.HIDDEN_API_BLACKLIST_EXEMPTIONS); diff --git a/services/autofill/java/com/android/server/autofill/AutofillManagerService.java b/services/autofill/java/com/android/server/autofill/AutofillManagerService.java index a5339e0e65496..7409ec2100399 100644 --- a/services/autofill/java/com/android/server/autofill/AutofillManagerService.java +++ b/services/autofill/java/com/android/server/autofill/AutofillManagerService.java @@ -575,7 +575,7 @@ public final class AutofillManagerService extends SystemService { private String getWhitelistedCompatModePackagesFromSettings() { return Settings.Global.getString( mContext.getContentResolver(), - Settings.Global.AUTOFILL_COMPAT_ALLOWED_PACKAGES); + Settings.Global.AUTOFILL_COMPAT_MODE_ALLOWED_PACKAGES); } @Nullable @@ -1179,7 +1179,7 @@ public final class AutofillManagerService extends SystemService { resolver.registerContentObserver(Settings.Secure.getUriFor( Settings.Secure.USER_SETUP_COMPLETE), false, this, UserHandle.USER_ALL); resolver.registerContentObserver(Settings.Global.getUriFor( - Settings.Global.AUTOFILL_COMPAT_ALLOWED_PACKAGES), false, this, + Settings.Global.AUTOFILL_COMPAT_MODE_ALLOWED_PACKAGES), false, this, UserHandle.USER_ALL); }