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

Commit 56321acc authored Jul 09, 2025 by Grace Cheng Committed by Android (Google) Code Review Jul 09, 2025

Merge "Follow the API council's suggestion to rename...

Merge "Follow the API council's suggestion to rename ACCESS_LOCATION_BYPASS_ALLOWLIST to READ_LOCATION_BYPASS_ALLOWLIST." into main

parents 1e06786b 7c50e7b3

core/api/system-current.txt

+1 −1

Original line number	Diff line number	Diff line
		@@ -17,7 +17,6 @@ package android {
		field @FlaggedApi("android.multiuser.enable_permission_to_access_hidden_profiles") public static final String ACCESS_HIDDEN_PROFILES_FULL = "android.permission.ACCESS_HIDDEN_PROFILES_FULL";
		field public static final String ACCESS_INSTANT_APPS = "android.permission.ACCESS_INSTANT_APPS";
		field @FlaggedApi("com.android.server.telecom.flags.telecom_resolve_hidden_dependencies") public static final String ACCESS_LAST_KNOWN_CELL_ID = "android.permission.ACCESS_LAST_KNOWN_CELL_ID";
		field @FlaggedApi("android.location.flags.change_get_adas_allowlist_from_hidden_to_system") public static final String ACCESS_LOCATION_BYPASS_ALLOWLIST = "android.permission.ACCESS_LOCATION_BYPASS_ALLOWLIST";
		field public static final String ACCESS_LOCUS_ID_USAGE_STATS = "android.permission.ACCESS_LOCUS_ID_USAGE_STATS";
		field public static final String ACCESS_MOCK_LOCATION = "android.permission.ACCESS_MOCK_LOCATION";
		field public static final String ACCESS_MTP = "android.permission.ACCESS_MTP";
		@@ -332,6 +331,7 @@ package android {
		field @FlaggedApi("android.content.pm.get_resolved_apk_path") public static final String READ_INSTALLED_SESSION_PATHS = "android.permission.READ_INSTALLED_SESSION_PATHS";
		field public static final String READ_INSTALL_SESSIONS = "android.permission.READ_INSTALL_SESSIONS";
		field @FlaggedApi("android.security.afl_api") public static final String READ_INTRUSION_DETECTION_STATE = "android.permission.READ_INTRUSION_DETECTION_STATE";
		field @FlaggedApi("android.location.flags.change_get_adas_allowlist_from_hidden_to_system") public static final String READ_LOCATION_BYPASS_ALLOWLIST = "android.permission.READ_LOCATION_BYPASS_ALLOWLIST";
		field public static final String READ_NETWORK_USAGE_HISTORY = "android.permission.READ_NETWORK_USAGE_HISTORY";
		field public static final String READ_OEM_UNLOCK_STATE = "android.permission.READ_OEM_UNLOCK_STATE";
		field public static final String READ_PEOPLE_DATA = "android.permission.READ_PEOPLE_DATA";

core/res/AndroidManifest.xml

+2 −2

Original line number	Diff line number	Diff line
		@@ -2186,11 +2186,11 @@
		android:featureFlag="android.location.flags.population_density_provider"
		android:protectionLevel="signature" />

		<!-- @SystemApi @hide Allows an application to access location bypass allowlist.
		<!-- @SystemApi @hide Allows an application to read location bypass allowlist.
		<p>Not for use by third-party applications.
		@FlaggedApi(android.location.flags.Flags.FLAG_CHANGE_GET_ADAS_ALLOWLIST_FROM_HIDDEN_TO_SYSTEM)
		-->
		<permission android:name="android.permission.ACCESS_LOCATION_BYPASS_ALLOWLIST"
		<permission android:name="android.permission.READ_LOCATION_BYPASS_ALLOWLIST"
		android:protectionLevel="signature\|privileged"
		android:featureFlag="android.location.flags.change_get_adas_allowlist_from_hidden_to_system" />

data/etc/privapp-permissions-platform.xml

+1 −1

Original line number	Diff line number	Diff line
		@@ -273,7 +273,7 @@ applications that come with the platform
		<!-- Needed for GMSCore Location API test only -->
		<permission name="android.permission.LOCATION_BYPASS"/>
		<!-- Needed for XTS tests only. -->
		<permission name="android.permission.ACCESS_LOCATION_BYPASS_ALLOWLIST"/>
		<permission name="android.permission.READ_LOCATION_BYPASS_ALLOWLIST"/>
		<!-- Needed for test only -->
		<permission name="android.permission.BATTERY_PREDICTION"/>
		<permission name="android.permission.BATTERY_STATS"/>

location/api/system-current.txt

+1 −1

Original line number	Diff line number	Diff line
		@@ -1178,7 +1178,7 @@ package android.location {
		public class LocationManager {
		method @Deprecated @FlaggedApi("android.location.flags.deprecate_provider_request_apis") @RequiresPermission(allOf={android.Manifest.permission.LOCATION_HARDWARE, android.Manifest.permission.INTERACT_ACROSS_USERS}) public void addProviderRequestChangedListener(@NonNull java.util.concurrent.Executor, @NonNull android.location.provider.ProviderRequest.ChangedListener);
		method @Deprecated @RequiresPermission(android.Manifest.permission.LOCATION_HARDWARE) public void flushGnssBatch();
		method @FlaggedApi("android.location.flags.change_get_adas_allowlist_from_hidden_to_system") @NonNull @RequiresPermission(android.Manifest.permission.ACCESS_LOCATION_BYPASS_ALLOWLIST) public android.os.PackageTagsList getAdasAllowlist();
		method @FlaggedApi("android.location.flags.change_get_adas_allowlist_from_hidden_to_system") @NonNull @RequiresPermission(android.Manifest.permission.READ_LOCATION_BYPASS_ALLOWLIST) public android.os.PackageTagsList getAdasAllowlist();
		method @Deprecated @RequiresPermission(anyOf={android.Manifest.permission.ACCESS_COARSE_LOCATION, android.Manifest.permission.ACCESS_FINE_LOCATION}) public void getCurrentLocation(@NonNull android.location.LocationRequest, @Nullable android.os.CancellationSignal, @NonNull java.util.concurrent.Executor, @NonNull java.util.function.Consumer<android.location.Location>);
		method @Nullable public String getExtraLocationControllerPackage();
		method @Deprecated public int getGnssBatchSize();

location/java/android/location/LocationManager.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -541,7 +541,7 @@ public class LocationManager {
		*/
		@FlaggedApi(Flags.FLAG_CHANGE_GET_ADAS_ALLOWLIST_FROM_HIDDEN_TO_SYSTEM)
		@SystemApi
		@RequiresPermission(Manifest.permission.ACCESS_LOCATION_BYPASS_ALLOWLIST)
		@RequiresPermission(Manifest.permission.READ_LOCATION_BYPASS_ALLOWLIST)
		public @NonNull PackageTagsList getAdasAllowlist() {
		try {
		return mService.getAdasAllowlist();