Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Renamed AUTOFILL_COMPAT_MODE_ALLOWED_PACKAGES." into pi-dev

Browse Source
This commit is contained in:
Felipe Leme
2018-03-22 16:24:53 +00:00
committed by Android (Google) Code Review
parent 8055aa2434 fd4003bf09
commit 4e561f83cb
7 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/system-current.txt
View File

@@ -4236,7 +4236,7 @@ package android.provider {
public static final class Settings.Global extends android.provider.Settings.NameValueTable { 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 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); 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_NAMES = "carrier_app_names";
field public static final java.lang.String CARRIER_APP_WHITELIST = "carrier_app_whitelist"; 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"; field public static final java.lang.String DEFAULT_SM_DP_PLUS = "default_sm_dp_plus";

2
api/test-current.txt
View File

@@ -570,7 +570,7 @@ package android.provider {
} }
public static final class Settings.Global extends android.provider.Settings.NameValueTable { 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 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 LOCATION_GLOBAL_KILL_SWITCH = "location_global_kill_switch";
field public static final java.lang.String LOW_POWER_MODE = "low_power"; field public static final java.lang.String LOW_POWER_MODE = "low_power";

4
core/java/android/provider/Settings.java
View File

@@ -11625,8 +11625,8 @@ public final class Settings {
*/ */
@SystemApi @SystemApi
@TestApi @TestApi
public static final String AUTOFILL_COMPAT_ALLOWED_PACKAGES = public static final String AUTOFILL_COMPAT_MODE_ALLOWED_PACKAGES =
"autofill_compat_allowed_packages"; "autofill_compat_mode_allowed_packages";
/** /**
* Exemptions to the hidden API blacklist. * Exemptions to the hidden API blacklist.

2
core/proto/android/providers/settings.proto
View File

@@ -466,7 +466,7 @@ message GlobalSettingsProto {
// skipped. // skipped.
optional SettingProto override_settings_provider_restore_any_version = 355 [ (android.privacy).dest = DEST_AUTOMATIC ]; 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 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 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 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 ]; optional SettingProto max_sound_trigger_detection_service_ops_per_day = 388 [ (android.privacy).dest = DEST_AUTOMATIC ];

2
core/tests/coretests/src/android/provider/SettingsBackupTest.java
View File

@@ -117,7 +117,7 @@ public class SettingsBackupTest {
Settings.Global.APP_STANDBY_ENABLED, Settings.Global.APP_STANDBY_ENABLED,
Settings.Global.ASSISTED_GPS_ENABLED, Settings.Global.ASSISTED_GPS_ENABLED,
Settings.Global.AUDIO_SAFE_VOLUME_STATE, 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_DURATION_THRESHOLD,
Settings.Global.BATTERY_DISCHARGE_THRESHOLD, Settings.Global.BATTERY_DISCHARGE_THRESHOLD,
Settings.Global.BATTERY_SAVER_DEVICE_SPECIFIC_CONSTANTS, Settings.Global.BATTERY_SAVER_DEVICE_SPECIFIC_CONSTANTS,

4
packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java
View File

@@ -1158,8 +1158,8 @@ class SettingsProtoDumpUtil {
Global.CHAINED_BATTERY_ATTRIBUTION_ENABLED, Global.CHAINED_BATTERY_ATTRIBUTION_ENABLED,
GlobalSettingsProto.CHAINED_BATTERY_ATTRIBUTION_ENABLED); GlobalSettingsProto.CHAINED_BATTERY_ATTRIBUTION_ENABLED);
dumpSetting(s, p, dumpSetting(s, p,
Settings.Global.AUTOFILL_COMPAT_ALLOWED_PACKAGES, Settings.Global.AUTOFILL_COMPAT_MODE_ALLOWED_PACKAGES,
GlobalSettingsProto.AUTOFILL_COMPAT_ALLOWED_PACKAGES); GlobalSettingsProto.AUTOFILL_COMPAT_MODE_ALLOWED_PACKAGES);
dumpSetting(s, p, dumpSetting(s, p,
Global.HIDDEN_API_BLACKLIST_EXEMPTIONS, Global.HIDDEN_API_BLACKLIST_EXEMPTIONS,
GlobalSettingsProto.HIDDEN_API_BLACKLIST_EXEMPTIONS); GlobalSettingsProto.HIDDEN_API_BLACKLIST_EXEMPTIONS);

4
services/autofill/java/com/android/server/autofill/AutofillManagerService.java
View File

@@ -575,7 +575,7 @@ public final class AutofillManagerService extends SystemService {
private String getWhitelistedCompatModePackagesFromSettings() { private String getWhitelistedCompatModePackagesFromSettings() {
return Settings.Global.getString( return Settings.Global.getString(
mContext.getContentResolver(), mContext.getContentResolver(),
Settings.Global.AUTOFILL_COMPAT_ALLOWED_PACKAGES); Settings.Global.AUTOFILL_COMPAT_MODE_ALLOWED_PACKAGES);
} }
@Nullable @Nullable
@@ -1179,7 +1179,7 @@ public final class AutofillManagerService extends SystemService {
resolver.registerContentObserver(Settings.Secure.getUriFor( resolver.registerContentObserver(Settings.Secure.getUriFor(
Settings.Secure.USER_SETUP_COMPLETE), false, this, UserHandle.USER_ALL); Settings.Secure.USER_SETUP_COMPLETE), false, this, UserHandle.USER_ALL);
resolver.registerContentObserver(Settings.Global.getUriFor( 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); UserHandle.USER_ALL);
} }