AVRCP: Stored volume when device will reboot/Poweroff from UI
Added action shutdown event to store current
active device volume.
CRs-Fixed: 2563711
Change-Id: I8ca332c873711aece60c3bd2c2ff36f4fa30a53f
diff --git a/packages_apps_bluetooth_ext/src/avrcp/Avrcp_ext.java b/packages_apps_bluetooth_ext/src/avrcp/Avrcp_ext.java
index 8b061ce..8c8062a 100644
--- a/packages_apps_bluetooth_ext/src/avrcp/Avrcp_ext.java
+++ b/packages_apps_bluetooth_ext/src/avrcp/Avrcp_ext.java
@@ -294,6 +294,7 @@
/* Broadcast receiver for device connections intent broadcasts */
private final BroadcastReceiver mAvrcpReceiver = new AvrcpServiceBroadcastReceiver();
private final BroadcastReceiver mBootReceiver = new AvrcpServiceBootReceiver();
+ private final BroadcastReceiver mShutDownReceiver = new AvrcpServiceShutDownReceiver();
/* Recording passthrough key dispatches */
static private final int PASSTHROUGH_LOG_MAX_SIZE = DEBUG ? 50 : 10;
@@ -531,6 +532,10 @@
pts_test = SystemProperties.getBoolean("vendor.bluetooth.avrcpct-passthrough.pts", false);
avrcp_playstatus_blacklist = SystemProperties.getBoolean("persist.vendor.btstack.avrcp-playstatus.blacklist", false);
+ IntentFilter shutdownFilter = new IntentFilter();
+ shutdownFilter.addAction(Intent.ACTION_SHUTDOWN);
+ context.registerReceiver(mShutDownReceiver, shutdownFilter);
+
// create Notification channel.
mNotificationManager = (NotificationManager)
mContext.getSystemService(Context.NOTIFICATION_SERVICE);
@@ -690,6 +695,7 @@
mAudioManagerPlaybackHandler = null;
mContext.unregisterReceiver(mAvrcpReceiver);
mContext.unregisterReceiver(mBootReceiver);
+ mContext.unregisterReceiver(mShutDownReceiver);
mPkgRequestedMBSConnect.clear();
mAddressedMediaPlayer.cleanup();
@@ -3637,6 +3643,26 @@
}
}
+ private class AvrcpServiceShutDownReceiver extends BroadcastReceiver {
+ @Override
+ public void onReceive(Context context, Intent intent) {
+ String action = intent.getAction();
+ BluetoothDevice device = null;
+ if (DEBUG) Log.d(TAG, "AvrcpServiceShutdownReceiver-> Action: " + action);
+ if (action.equals(Intent.ACTION_SHUTDOWN)) {
+ int storeVolume = mAudioManager.getStreamVolume(AudioManager.STREAM_MUSIC);
+ if (DEBUG) Log.d(TAG, "AvrcpServiceShutdownReceiver store volume " + storeVolume);
+ if (mA2dpService != null)
+ device = mA2dpService.getActiveDevice();
+ SharedPreferences.Editor pref = getVolumeMap().edit();
+ if (device != null) {
+ pref.putInt(device.getAddress(), storeVolume);
+ pref.apply();
+ }
+ }
+ }
+ }
+
private void handlePackageModified(String packageName, boolean removed) {
if (DEBUG) Log.d(TAG, "packageName: " + packageName + " removed: " + removed);