Bluetooth: Add locale support during PBAP upgrade/ downgrade notification
Steps
1. Set DUT's locale language to Portuguese.
2. Receive PBAP connect request from remote
Observed result:
Profile showing notification in English.
Expected result:
The language of the notification should be same as system's.
Root cause:
The notification text is hardcoding with English strings in code.
Fix:
Add PBAP 1.2 notification related flags in xml to support locale,
also show notification text through localized version of
getString() instead of as hardcoded item from code and remove unused methods.
CRs-Fixed: 2619791
Change-Id: If8d385c396ec371b1c477800c48a226f9b33977c
diff --git a/packages_apps_bluetooth_ext/src/pbap/BluetoothPbapFixes.java b/packages_apps_bluetooth_ext/src/pbap/BluetoothPbapFixes.java
index b1307a0..f733d77 100644
--- a/packages_apps_bluetooth_ext/src/pbap/BluetoothPbapFixes.java
+++ b/packages_apps_bluetooth_ext/src/pbap/BluetoothPbapFixes.java
@@ -255,11 +255,6 @@
}
}
- protected static void updateMtu(ServerSession serverSession, boolean isSrmSupported,
- int rfcommMaxMTU) {
- // TODO: TO Remove this API from here and its invocation (startObexServerSession)
- }
-
public static MatrixCursor filterOutSimContacts(Cursor contactCursor) {
if (contactCursor == null)
return null;
@@ -472,14 +467,13 @@
context.getSystemService(Context.NOTIFICATION_SERVICE);
NotificationChannel mChannel = new NotificationChannel(PBAP_NOTIFICATION_ID,
PBAP_NOTIFICATION_NAME, NotificationManager.IMPORTANCE_DEFAULT);
- mChannel.setDescription("Remote Phonebook Profile Version Change");
mNotificationManager.createNotificationChannel(mChannel);
-
// create notification
- String title = isUpgrade ? "Phonebook Advance Feature Supported" :
- "Remote Phonebook Feature Downgrade";
- String contentText = isUpgrade ? "Re-pair for Advance Phonebook Feature.":
- "Re-pair for Phonebook Access Version Compatibility";
+ String title = isUpgrade ? context.getString(R.string.phonebook_advance_feature_support) :
+ context.getString(R.string.remote_phonebook_feature_downgrade);
+ String contentText = isUpgrade ? context.getString
+ (R.string.repair_for_adv_phonebook_feature):
+ context.getString(R.string.repair_for_phonebook_access_version_comp);
int NOTIFICATION_ID = android.R.drawable.stat_sys_data_bluetooth;
Notification notification = new Notification.Builder(context,PBAP_NOTIFICATION_ID)
.setContentTitle(title)