Merge 5c58ca5696b0bf1e1314a060897fdf6e09e0136c on remote branch
Change-Id: I51f8e3c7eab9190d4c9c5c67146613b7c6248589
diff --git a/packages_apps_bluetooth_ext/src/avrcp/Avrcp_ext.java b/packages_apps_bluetooth_ext/src/avrcp/Avrcp_ext.java
index 7c556bb..e66b164 100644
--- a/packages_apps_bluetooth_ext/src/avrcp/Avrcp_ext.java
+++ b/packages_apps_bluetooth_ext/src/avrcp/Avrcp_ext.java
@@ -2243,16 +2243,14 @@
Log.v(TAG,"updateCurrentMediaState: isPlaying = " + isPlaying);
// Use A2DP state if we don't have a MediaControlller
PlaybackState.Builder builder = new PlaybackState.Builder();
- if (mMediaController == null || mMediaController.getPlaybackState() == null) {
- Log.v(TAG,"updateCurrentMediaState: mMediaController or getPlaybackState() null");
- if (isPlaying) {
- builder.setState(PlaybackState.STATE_PLAYING,
- PlaybackState.PLAYBACK_POSITION_UNKNOWN, 1.0f);
- } else {
- builder.setState(PlaybackState.STATE_PAUSED,
- PlaybackState.PLAYBACK_POSITION_UNKNOWN, 0.0f);
- }
+ if (isPlaying) {
+ builder.setState(PlaybackState.STATE_PLAYING,
+ PlaybackState.PLAYBACK_POSITION_UNKNOWN, 1.0f);
} else {
+ builder.setState(PlaybackState.STATE_PAUSED,
+ PlaybackState.PLAYBACK_POSITION_UNKNOWN, 0.0f);
+ }
+ if (mMediaController != null && mMediaController.getPlaybackState() != null) {
int mMediaPlayState = mMediaController.getPlaybackState().getState();
if (isPlaying) {
builder.setState(PlaybackState.STATE_PLAYING,
diff --git a/packages_apps_bluetooth_ext/src/map/src/BluetoothMapFixes.java b/packages_apps_bluetooth_ext/src/map/src/BluetoothMapFixes.java
index c91e380..127f5f2 100644
--- a/packages_apps_bluetooth_ext/src/map/src/BluetoothMapFixes.java
+++ b/packages_apps_bluetooth_ext/src/map/src/BluetoothMapFixes.java
@@ -39,6 +39,7 @@
import android.os.RemoteException;
import android.util.Log;
import android.util.SparseArray;
+import com.android.bluetooth.R;
import com.android.bluetooth.Utils;
import com.android.bluetooth.btservice.AdapterService;
import com.android.bluetooth.btservice.AbstractionLayer;
@@ -207,10 +208,12 @@
}
// create notification
- String title = isUpgrade ? "Message access Advance Feature Supported" :
- "Remote Message access Feature Downgrade";
- String contentText = isUpgrade ? "Re-pair for Advance Message access Feature.":
- "Re-pair for Message access Version Compatibility";
+ String title = isUpgrade ?
+ context.getString(R.string.bluetooth_map_remote_advance_feature_support):
+ context.getString(R.string.bluetooth_map_remote_message_access_feature_downgrade);
+ String contentText = isUpgrade ?
+ context.getString(R.string.bluetooth_map_repair_for_adv_message_access_feature):
+ context.getString(R.string.bluetooth_map_repair_for_message_access_version_comp);
Notification notification = new Notification.Builder(context,MAP_NOTIFICATION_ID)
.setContentTitle(title)
.setContentText(contentText)
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)
diff --git a/system_bt_ext/btconfigstore/Android.bp b/system_bt_ext/btconfigstore/Android.bp
index 2c82531..888921c 100644
--- a/system_bt_ext/btconfigstore/Android.bp
+++ b/system_bt_ext/btconfigstore/Android.bp
@@ -33,4 +33,12 @@
required: [
"bt_configstore.conf",
],
+
+ arch: {
+ arm: {
+ cflags: [
+ "-DARCH_ARM_32"
+ ],
+ },
+ },
}
diff --git a/system_bt_ext/btconfigstore/bt_configstore.cc b/system_bt_ext/btconfigstore/bt_configstore.cc
index 0e05453..9d0b51d 100644
--- a/system_bt_ext/btconfigstore/bt_configstore.cc
+++ b/system_bt_ext/btconfigstore/bt_configstore.cc
@@ -82,8 +82,6 @@
static bt_soc_type_t convertSocNameToBTSocType(const char * name);
static const char * convertPropTypeToStringFormat(uint32_t propType);
-const bool IsLazyHalSupported(property_get_bool("ro.vendor.bt.enablelazyhal", false));
-
EXPORT_SYMBOL bt_configstore_interface_t btConfigStoreInterface = {
sizeof(btConfigStoreInterface),
getVendorProperties,
@@ -93,6 +91,37 @@
convertPropTypeToStringFormat,
};
+#ifdef ARCH_ARM_32
+bool IsLazyHalSupported()
+{
+ static bool isPropertyRead = false;
+ static bool isLazyHalEnabled = false;
+
+ /* MSM8937 target supports both lazy and non lazy hal
+ * which is differentiated by a property.
+ * isLazyHalPropStatus holds the property status.
+ */
+ ALOGD("%s isPropertyRead: %d isLazyHalEnabled: %d", __func__, isPropertyRead,
+ isLazyHalEnabled);
+
+ if (!isPropertyRead) {
+ char device[PROPERTY_VALUE_MAX]= {'\0'};
+ int len = property_get("ro.board.platform", device, "");
+ if (len) {
+ isPropertyRead = true;
+ isLazyHalEnabled = (!strcmp(device, "bengal") ? true : false);
+ if (!isLazyHalEnabled && !strcmp(device, "msm8937")) {
+ isLazyHalEnabled = property_get_bool("ro.vendor.bt.enablelazyhal", false);
+ }
+ ALOGD("%s isLazyHalEnabled: %d", __func__, isLazyHalEnabled);
+ } else {
+ ALOGE("%s: Failed to read property", __func__);
+ }
+ }
+
+ return isLazyHalEnabled;
+}
+#endif
/*******************************************************************************
**
@@ -150,8 +179,12 @@
}
}
- if (IsLazyHalSupported && btConfigStore != nullptr)
+#ifdef ARCH_ARM_32
+ if (btConfigStore != nullptr && IsLazyHalSupported()) {
+ LOG_DEBUG(LOG_TAG, "%s: decrementing HIDL usage counter", __func__);
IPCThreadState::self()->flushCommands();
+ }
+#endif
btConfigStore = nullptr;
return status;
@@ -193,8 +226,12 @@
LOG_WARN(LOG_TAG, "%s btConfigStore is null", __func__);
}
- if (IsLazyHalSupported && btConfigStore != nullptr)
+#ifdef ARCH_ARM_32
+ if (btConfigStore != nullptr && IsLazyHalSupported()) {
+ LOG_DEBUG(LOG_TAG, "%s: decrementing HIDL usage counter", __func__);
IPCThreadState::self()->flushCommands();
+ }
+#endif
btConfigStore = nullptr;
return status;
@@ -259,8 +296,12 @@
LOG_WARN(LOG_TAG, "%s add feature is not avaliable", __func__);
}
- if (IsLazyHalSupported && btConfigStore != nullptr)
+#ifdef ARCH_ARM_32
+ if (btConfigStore != nullptr && IsLazyHalSupported()) {
+ LOG_DEBUG(LOG_TAG, "%s: decrementing HIDL usage counter", __func__);
IPCThreadState::self()->flushCommands();
+ }
+#endif
btConfigStore = nullptr;
return status;