Merge "Remove location_permissions_upgrade_to_q_mode" (0d3aaf89) · Commits · e / os / android_frameworks_base

api/system-current.txt

+1 −1

Original line number	Diff line number	Diff line
		@@ -6063,7 +6063,7 @@ package android.provider {
		field public static final String LAST_SETUP_SHOWN = "last_setup_shown";
		field public static final String LOCATION_ACCESS_CHECK_DELAY_MILLIS = "location_access_check_delay_millis";
		field public static final String LOCATION_ACCESS_CHECK_INTERVAL_MILLIS = "location_access_check_interval_millis";
		field public static final String LOCATION_PERMISSIONS_UPGRADE_TO_Q_MODE = "location_permissions_upgrade_to_q_mode";
		field @Deprecated public static final String LOCATION_PERMISSIONS_UPGRADE_TO_Q_MODE = "location_permissions_upgrade_to_q_mode";
		field public static final String LOCK_SCREEN_ALLOW_PRIVATE_NOTIFICATIONS = "lock_screen_allow_private_notifications";
		field public static final String LOCK_SCREEN_SHOW_NOTIFICATIONS = "lock_screen_show_notifications";
		field public static final String ODI_CAPTIONS_ENABLED = "odi_captions_enabled";

+2 −7

Original line number	Diff line number	Diff line
		@@ -8692,16 +8692,11 @@ public final class Settings {
		"location_access_check_delay_millis";

		/**
		* What should happen to the location permissions when upgraded to Android Q.
		*
		* <ul>
		* <li>0/unset == revoke permissions</li>
		* <li>anything else == Don't do anything</li>
		* </ul>
		*
		* @deprecated This setting does not have any effect anymore
		* @hide
		*/
		@SystemApi
		@Deprecated
		public static final String LOCATION_PERMISSIONS_UPGRADE_TO_Q_MODE =
		"location_permissions_upgrade_to_q_mode";

+1 −3

Original line number	Diff line number	Diff line
		@@ -251,9 +251,7 @@ message SecureSettingsProto {
		// The App or module that changes the location mode.
		optional SettingProto changer = 2 [ (android.privacy).dest = DEST_AUTOMATIC ];

		// What should happen to the location permissions when upgraded to Android Q.
		// 0 == revoke permissions. Anything else == do nothing.
		optional SettingProto permissions_upgrade_to_q_mode = 3 [ (android.privacy).dest = DEST_AUTOMATIC ];
		reserved 3; // used to be used for permissions_upgrade_to_q_mode
		}
		optional Location location = 31;

+0 −3

Original line number	Diff line number	Diff line
		@@ -2005,9 +2005,6 @@ class SettingsProtoDumpUtil {
		dumpSetting(s, p,
		Settings.Secure.LOCATION_CHANGER,
		SecureSettingsProto.Location.CHANGER);
		dumpSetting(s, p,
		Settings.Secure.LOCATION_PERMISSIONS_UPGRADE_TO_Q_MODE,
		SecureSettingsProto.Location.PERMISSIONS_UPGRADE_TO_Q_MODE);
		p.end(locationToken);

		final long locationAccessCheckToken = p.start(SecureSettingsProto.LOCATION_ACCESS_CHECK);