Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cache stream volumes to prevent ANR

Browse Source 
MediaRourter uses main thread for internal operations, and ANR could
happens if AudioService is not running when MediaRouter tried to get
stream volumes. This CL avoids such ANR by caching stream volumes.

Bug: 170327593
Test: manually
(cherry picked from internal master branch)

Change-Id: I7c00b26a3a25f17c877d3ec0e998905ab0b4af28
This commit is contained in:
Sungsoo Lim
2020-12-24 01:36:18 +00:00
parent 928789a180
commit 96d134d75a
1 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
media/java/android/media/MediaRouter.java
View File

@@ -43,6 +43,7 @@ import android.os.RemoteException;
import android.os.ServiceManager;
import android.os.UserHandle;
import android.text.TextUtils;
import android.util.ArrayMap;
import android.util.Log;
import android.view.Display;
@@ -51,6 +52,7 @@ import java.lang.annotation.RetentionPolicy;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.concurrent.CopyOnWriteArrayList;
@@ -108,6 +110,8 @@ public class MediaRouter {
IMediaRouterClient mClient;
MediaRouterClientState mClientState;
Map<Integer, Integer> mStreamVolume = new ArrayMap<>();
final IAudioRoutesObserver.Stub mAudioRoutesObserver = new IAudioRoutesObserver.Stub() {
@Override
public void dispatchAudioRoutesChanged(final AudioRoutesInfo newRoutes) {
@@ -259,6 +263,17 @@ public class MediaRouter {
mCurAudioRoutesInfo.bluetoothName = newRoutes.bluetoothName;
}
int getStreamVolume(int streamType) {
if (!mStreamVolume.containsKey(streamType)) {
try {
mStreamVolume.put(streamType, mAudioService.getStreamVolume(streamType));
} catch (RemoteException e) {
Log.e(TAG, "Error getting local stream volume", e);
}
}
return mStreamVolume.get(streamType);
}
boolean isBluetoothA2dpOn() {
try {
return mBluetoothA2dpRoute != null && mAudioService.isBluetoothA2dpOn();
@@ -1956,13 +1971,7 @@ public class MediaRouter {
*/
public int getVolume() {
if (mPlaybackType == PLAYBACK_TYPE_LOCAL) {
int vol = 0;
try {
vol = sStatic.mAudioService.getStreamVolume(mPlaybackStream);
} catch (RemoteException e) {
Log.e(TAG, "Error getting local stream volume", e);
}
return vol;
return sStatic.getStreamVolume(mPlaybackStream);
} else {
return mVolume;
}
@@ -3077,11 +3086,12 @@ public class MediaRouter {
if (intent.getAction().equals(AudioManager.VOLUME_CHANGED_ACTION)) {
final int streamType = intent.getIntExtra(AudioManager.EXTRA_VOLUME_STREAM_TYPE,
-1);
final int newVolume = intent.getIntExtra(AudioManager.EXTRA_VOLUME_STREAM_VALUE, 0);
sStatic.mStreamVolume.put(streamType, newVolume);
if (streamType != AudioManager.STREAM_MUSIC) {
return;
}
final int newVolume = intent.getIntExtra(AudioManager.EXTRA_VOLUME_STREAM_VALUE, 0);
final int oldVolume = intent.getIntExtra(
AudioManager.EXTRA_PREV_VOLUME_STREAM_VALUE, 0);
if (newVolume != oldVolume) {