GNSS Satellite Blocklist Renaming (8318aba8) · Commits · e / os / android_frameworks_base

api/system-current.txt

+2 −1

Original line number	Diff line number	Diff line
		@@ -3825,7 +3825,8 @@ package android.location {
		method public boolean hasMeasurementCorrectionsReflectingPane();
		method public boolean hasMeasurements();
		method public boolean hasNavMessages();
		method public boolean hasSatelliteBlacklist();
		method @Deprecated public boolean hasSatelliteBlacklist();
		method public boolean hasSatelliteBlocklist();
		}

		public final class GnssMeasurementCorrections implements android.os.Parcelable {

+2 −1

Original line number	Diff line number	Diff line
		@@ -3765,7 +3765,8 @@ package android.location {
		method public boolean hasMeasurementCorrectionsReflectingPane();
		method public boolean hasMeasurements();
		method public boolean hasNavMessages();
		method public boolean hasSatelliteBlacklist();
		method @Deprecated public boolean hasSatelliteBlacklist();
		method public boolean hasSatelliteBlocklist();
		}

		public final class GnssMeasurementCorrections implements android.os.Parcelable {

+3 −4

Original line number	Diff line number	Diff line
		@@ -14283,18 +14283,17 @@ public final class Settings {
		"backup_agent_timeout_parameters";

		/**
		* Blacklist of GNSS satellites.
		* Blocklist of GNSS satellites.
		*
		* This is a list of integers separated by commas to represent pairs of (constellation,
		* svid). Thus, the number of integers should be even.
		*
		* E.g.: "3,0,5,24" denotes (constellation=3, svid=0) and (constellation=5, svid=24) are
		* blacklisted. Note that svid=0 denotes all svids in the
		* constellation are blacklisted.
		* blocklisted. Note that svid=0 denotes all svids in the constellation are blocklisted.
		*
		* @hide
		*/
		public static final String GNSS_SATELLITE_BLACKLIST = "gnss_satellite_blacklist";
		public static final String GNSS_SATELLITE_BLOCKLIST = "gnss_satellite_blocklist";

		/**
		* Duration of updates in millisecond for GNSS location request from HAL to framework.

+1 −1

Original line number	Diff line number	Diff line
		@@ -535,7 +535,7 @@ message GlobalSettingsProto {
		// If set to 1, {@link Secure#LOCATION_MODE} will be set to {@link
		// Secure#LOCATION_MODE_OFF} temporarily for all users.
		optional SettingProto global_kill_switch = 5 [ (android.privacy).dest = DEST_AUTOMATIC ];
		optional SettingProto gnss_satellite_blacklist = 6 [ (android.privacy).dest = DEST_AUTOMATIC ];
		optional SettingProto gnss_satellite_blocklist = 6 [ (android.privacy).dest = DEST_AUTOMATIC ];
		optional SettingProto gnss_hal_location_request_duration_millis = 7 [ (android.privacy).dest = DEST_AUTOMATIC ];
		// Packages that are whitelisted for ignoring location settings (during emergencies)
		optional SettingProto ignore_settings_package_whitelist = 8 [ (android.privacy).dest = DEST_AUTOMATIC ];

+17 −4

Original line number	Diff line number	Diff line
		@@ -29,10 +29,10 @@ public final class GnssCapabilities {
		public static final long LOW_POWER_MODE = 1L << 0;

		/**
		* Bit mask indicating GNSS chipset supports blacklisting satellites.
		* Bit mask indicating GNSS chipset supports blocklisting satellites.
		* @hide
		*/
		public static final long SATELLITE_BLACKLIST = 1L << 1;
		public static final long SATELLITE_BLOCKLIST = 1L << 1;

		/**
		* Bit mask indicating GNSS chipset supports geofencing.
		@@ -110,14 +110,27 @@ public final class GnssCapabilities {
		}

		/**
		* Returns {@code true} if GNSS chipset supports blacklisting satellites, {@code false}
		* Returns {@code true} if GNSS chipset supports blocklisting satellites, {@code false}
		* otherwise.
		*
		* @hide
		* @deprecated use {@link #hasSatelliteBlocklist} instead.
		*/
		@SystemApi
		@Deprecated
		public boolean hasSatelliteBlacklist() {
		return hasCapability(SATELLITE_BLACKLIST);
		return hasCapability(SATELLITE_BLOCKLIST);
		}

		/**
		* Returns {@code true} if GNSS chipset supports blocklisting satellites, {@code false}
		* otherwise.
		*
		* @hide
		*/
		@SystemApi
		public boolean hasSatelliteBlocklist() {
		return hasCapability(SATELLITE_BLOCKLIST);
		}

		/**