From 46f0869e440ec05086a4916b95855b865eeb085c Mon Sep 17 00:00:00 2001 From: Etienne Ruffieux Date: Wed, 22 Dec 2021 15:44:54 +0000 Subject: Migrating Bluetooth resources to Bluetooth module In order for the Bluetooth module to build as an apex all non-public resources must be located in the same package. Made getMaxConnectedAudioDevices system API in order for development Settings to access it. Removed isInbandRingingSupported as only usage was by bt service (config is now directly in service). Removed isBluetoothVoiceDialingEnabled as there were no usages, and no overlays. All configs used only by the Bluetooth app are moved to the Bluetooth module. Tag: #feature Bug: 211570675 Test: build Test: make RunSettingsRoboTests Change-Id: Ieed30c31fc44b5b477d43ae120ef11f96ab115ca --- .../java/com/android/server/bluetooth/BluetoothModeChangeHelper.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'service/java/com/android/server/bluetooth/BluetoothModeChangeHelper.java') diff --git a/service/java/com/android/server/bluetooth/BluetoothModeChangeHelper.java b/service/java/com/android/server/bluetooth/BluetoothModeChangeHelper.java index e5854c9682..a67c6caa63 100644 --- a/service/java/com/android/server/bluetooth/BluetoothModeChangeHelper.java +++ b/service/java/com/android/server/bluetooth/BluetoothModeChangeHelper.java @@ -28,7 +28,6 @@ import android.content.res.Resources; import android.provider.Settings; import android.widget.Toast; -import com.android.internal.R; import com.android.internal.annotations.VisibleForTesting; /** @@ -131,8 +130,8 @@ public class BluetoothModeChangeHelper { @VisibleForTesting public void showToastMessage() { Resources r = mContext.getResources(); - final CharSequence text = r.getString( - R.string.bluetooth_airplane_mode_toast, 0); + final CharSequence text = r.getString(Resources.getSystem().getIdentifier( + "bluetooth_airplane_mode_toast", "string", "android")); Toast.makeText(mContext, text, Toast.LENGTH_LONG).show(); } -- cgit v1.2.3