Merge "Config: Remove unused isGdEnabledUpToScanningLayer" into main (8fa9997b) · Commits · e / os / android_packages_modules_Bluetooth

android/app/res/values/config.xml

+0 −11

Original line number	Original line	Diff line number	Diff line
	@@ -163,17 +163,6 @@
	<!-- Package that is providing the exposure notification service -->		<!-- Package that is providing the exposure notification service -->
	<string name="exposure_notification_package">com.google.android.gms</string>		<string name="exposure_notification_package">com.google.android.gms</string>

	<!-- Enabling Gabeldorsche up to the scanning layer, including
	- BLE scanning
	- BLE advertising
	- ACL connection management
	- Controller information management
	- HCI layer
	- HAL interface layer
	- Other required GD components like config storage
	-->
	<bool name="enable_gd_up_to_scanning_layer">true</bool>

	<!-- Package of fastpair service -->		<!-- Package of fastpair service -->
	<string name="peripheral_link_package">com.google.android.gms</string>		<string name="peripheral_link_package">com.google.android.gms</string>
	<!-- Service name of fastpair-->		<!-- Service name of fastpair-->

android/app/src/com/android/bluetooth/btservice/Config.java

+0 −16

Original line number	Original line	Diff line number	Diff line
	@@ -18,12 +18,10 @@ package com.android.bluetooth.btservice;

	import android.bluetooth.BluetoothProfile;		import android.bluetooth.BluetoothProfile;
	import android.content.Context;		import android.content.Context;
	import android.content.res.Resources;
	import android.os.SystemProperties;		import android.os.SystemProperties;
	import android.sysprop.BluetoothProperties;		import android.sysprop.BluetoothProperties;
	import android.util.Log;		import android.util.Log;

	import com.android.bluetooth.R;
	import com.android.bluetooth.Utils;		import com.android.bluetooth.Utils;
	import com.android.bluetooth.a2dp.A2dpService;		import com.android.bluetooth.a2dp.A2dpService;
	import com.android.bluetooth.a2dpsink.A2dpSinkService;		import com.android.bluetooth.a2dpsink.A2dpSinkService;
	@@ -181,7 +179,6 @@ public class Config {

	private static List<Class> sSupportedProfiles = new ArrayList<>();		private static List<Class> sSupportedProfiles = new ArrayList<>();

	private static boolean sIsGdEnabledUptoScanningLayer = false;

	static void init(Context ctx) {		static void init(Context ctx) {
	if (LeAudioService.isBroadcastEnabled()) {		if (LeAudioService.isBroadcastEnabled()) {
	@@ -231,15 +228,6 @@ public class Config {
	}		}
	}		}
	}		}

	if (ctx == null) {
	return;
	}
	Resources resources = ctx.getResources();
	if (resources == null) {
	return;
	}
	sIsGdEnabledUptoScanningLayer = resources.getBoolean(R.bool.enable_gd_up_to_scanning_layer);
	}		}

	static void setLeAudioProfileStatus(Boolean enable) {		static void setLeAudioProfileStatus(Boolean enable) {
	@@ -300,10 +288,6 @@ public class Config {
	}		}
	}		}

	static boolean isGdEnabledUpToScanningLayer() {
	return sIsGdEnabledUptoScanningLayer;
	}

	private static long getProfileMask(Class profile) {		private static long getProfileMask(Class profile) {
	for (ProfileConfig config : PROFILE_SERVICES_AND_FLAGS) {		for (ProfileConfig config : PROFILE_SERVICES_AND_FLAGS) {
	if (config.mClass == profile) {		if (config.mClass == profile) {