Fix java.lang.ArrayIndexOutOfBoundsException in RemoteVolumeGroupController
-Caused by removing and adding preference at the same time -Make preference operation method synchronized -Not to update preference by removing and adding. To check session status and update its content to preference -Post to UI thread to handle the onDeviceListUpdate() callback from framework Bug: 170049403 Test: make -j50 RunSettingsRoboTests Change-Id: Ibfc11e1bd99ba2e578b5d9e7dcc9132e372b68dd
This commit is contained in:
@@ -102,26 +102,26 @@ public class RemoteVolumeGroupController extends BasePreferenceController implem
|
|||||||
mLocalMediaManager.stopScan();
|
mLocalMediaManager.stopScan();
|
||||||
}
|
}
|
||||||
|
|
||||||
private void refreshPreference() {
|
private synchronized void refreshPreference() {
|
||||||
mPreferenceCategory.removeAll();
|
|
||||||
if (!isAvailable()) {
|
if (!isAvailable()) {
|
||||||
mPreferenceCategory.setVisible(false);
|
mPreferenceCategory.setVisible(false);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
final CharSequence castVolume = mContext.getText(R.string.remote_media_volume_option_title);
|
final CharSequence castVolume = mContext.getText(R.string.remote_media_volume_option_title);
|
||||||
mPreferenceCategory.setVisible(true);
|
mPreferenceCategory.setVisible(true);
|
||||||
|
|
||||||
for (RoutingSessionInfo info : mRoutingSessionInfos) {
|
for (RoutingSessionInfo info : mRoutingSessionInfos) {
|
||||||
if (mPreferenceCategory.findPreference(info.getId()) != null) {
|
final CharSequence appName = Utils.getApplicationLabel(mContext,
|
||||||
continue;
|
info.getClientPackageName());
|
||||||
|
RemoteVolumeSeekBarPreference seekBarPreference = mPreferenceCategory.findPreference(
|
||||||
|
info.getId());
|
||||||
|
if (seekBarPreference != null) {
|
||||||
|
// Update slider
|
||||||
|
if (seekBarPreference.getProgress() != info.getVolume()) {
|
||||||
|
seekBarPreference.setProgress(info.getVolume());
|
||||||
}
|
}
|
||||||
final CharSequence appName = Utils.getApplicationLabel(
|
} else {
|
||||||
mContext, info.getClientPackageName());
|
|
||||||
final CharSequence outputTitle = mContext.getString(R.string.media_output_label_title,
|
|
||||||
appName);
|
|
||||||
// Add slider
|
// Add slider
|
||||||
final RemoteVolumeSeekBarPreference seekBarPreference =
|
seekBarPreference = new RemoteVolumeSeekBarPreference(mContext);
|
||||||
new RemoteVolumeSeekBarPreference(mContext);
|
|
||||||
seekBarPreference.setKey(info.getId());
|
seekBarPreference.setKey(info.getId());
|
||||||
seekBarPreference.setTitle(castVolume);
|
seekBarPreference.setTitle(castVolume);
|
||||||
seekBarPreference.setMax(info.getVolumeMax());
|
seekBarPreference.setMax(info.getVolumeMax());
|
||||||
@@ -130,15 +130,52 @@ public class RemoteVolumeGroupController extends BasePreferenceController implem
|
|||||||
seekBarPreference.setOnPreferenceChangeListener(this);
|
seekBarPreference.setOnPreferenceChangeListener(this);
|
||||||
seekBarPreference.setIcon(R.drawable.ic_volume_remote);
|
seekBarPreference.setIcon(R.drawable.ic_volume_remote);
|
||||||
mPreferenceCategory.addPreference(seekBarPreference);
|
mPreferenceCategory.addPreference(seekBarPreference);
|
||||||
// Add output indicator
|
}
|
||||||
|
|
||||||
|
Preference switcherPreference = mPreferenceCategory.findPreference(
|
||||||
|
SWITCHER_PREFIX + info.getId());
|
||||||
final boolean isMediaOutputDisabled = mLocalMediaManager.shouldDisableMediaOutput(
|
final boolean isMediaOutputDisabled = mLocalMediaManager.shouldDisableMediaOutput(
|
||||||
info.getClientPackageName());
|
info.getClientPackageName());
|
||||||
final Preference preference = new Preference(mContext);
|
final CharSequence outputTitle = mContext.getString(R.string.media_output_label_title,
|
||||||
preference.setKey(SWITCHER_PREFIX + info.getId());
|
appName);
|
||||||
preference.setTitle(isMediaOutputDisabled ? appName : outputTitle);
|
if (switcherPreference != null) {
|
||||||
preference.setSummary(info.getName());
|
// Update output indicator
|
||||||
preference.setEnabled(!isMediaOutputDisabled);
|
switcherPreference.setTitle(isMediaOutputDisabled ? appName : outputTitle);
|
||||||
mPreferenceCategory.addPreference(preference);
|
switcherPreference.setSummary(info.getName());
|
||||||
|
switcherPreference.setEnabled(!isMediaOutputDisabled);
|
||||||
|
} else {
|
||||||
|
// Add output indicator
|
||||||
|
switcherPreference = new Preference(mContext);
|
||||||
|
switcherPreference.setKey(SWITCHER_PREFIX + info.getId());
|
||||||
|
switcherPreference.setTitle(isMediaOutputDisabled ? appName : outputTitle);
|
||||||
|
switcherPreference.setSummary(info.getName());
|
||||||
|
switcherPreference.setEnabled(!isMediaOutputDisabled);
|
||||||
|
mPreferenceCategory.addPreference(switcherPreference);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Check and remove non-active session preference
|
||||||
|
// There is a pair of preferences for each session. First one is a seekBar preference.
|
||||||
|
// The second one shows the session information and provide an entry-point to launch output
|
||||||
|
// switcher. It is unnecessary to go through all preferences. It is fine ignore the second
|
||||||
|
// preference and only to check the seekBar's key value.
|
||||||
|
for (int i = 0; i < mPreferenceCategory.getPreferenceCount(); i = i + 2) {
|
||||||
|
final Preference preference = mPreferenceCategory.getPreference(i);
|
||||||
|
boolean isActive = false;
|
||||||
|
for (RoutingSessionInfo info : mRoutingSessionInfos) {
|
||||||
|
if (TextUtils.equals(preference.getKey(), info.getId())) {
|
||||||
|
isActive = true;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (isActive) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
final Preference switcherPreference = mPreferenceCategory.getPreference(i + 1);
|
||||||
|
if (switcherPreference != null) {
|
||||||
|
mPreferenceCategory.removePreference(preference);
|
||||||
|
mPreferenceCategory.removePreference(switcherPreference);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -181,8 +218,10 @@ public class RemoteVolumeGroupController extends BasePreferenceController implem
|
|||||||
// Preference group is not ready.
|
// Preference group is not ready.
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
ThreadUtils.postOnMainThread(() -> {
|
||||||
initRemoteMediaSession();
|
initRemoteMediaSession();
|
||||||
refreshPreference();
|
refreshPreference();
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
Reference in New Issue
Block a user