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

Volume dialog controller: make loading of stream names more robust

Browse Source 
The loading of the stream type volume names assumes there are
  as many read as declared stream types. Verify this is the
  case, if not, complete the array of names with empty strings,
  or remove unneeded entries.

Test: boot in non en-US language
Bug: 33260083

Change-Id: I6632eadd34c4b8af2c8fd01ae7eae45fc513b3e1
This commit is contained in:
Jean-Michel Trivi
2016-12-02 15:40:02 -08:00
parent 2c756a65df
commit 4c7394a854
2 changed files with 22 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
packages/SystemUI/res/values/strings.xml
View File

@@ -1126,6 +1126,7 @@
<item></item> <!-- STREAM_SYSTEM_ENFORCED -->
<item></item> <!-- STREAM_DTMF -->
<item></item> <!-- STREAM_TTS -->
<item>Accessibility</item> <!-- STREAM_ACCESSIBILITY -->
</string-array>
<string name="volume_stream_muted" translatable="false">%s silent</string>

22
packages/SystemUI/src/com/android/systemui/volume/VolumeDialogController.java
View File

@@ -78,6 +78,7 @@ public class VolumeDialogController {
AudioSystem.STREAM_SYSTEM_ENFORCED,
AudioSystem.STREAM_TTS,
AudioSystem.STREAM_VOICE_CALL,
AudioSystem.STREAM_ACCESSIBILITY,
};
private final HandlerThread mWorkerThread;
@@ -119,7 +120,26 @@ public class VolumeDialogController {
mObserver = new SettingObserver(mWorker);
mObserver.init();
mReceiver.init();
mStreamTitles = mContext.getResources().getStringArray(R.array.volume_stream_titles);
final String[] titles =
mContext.getResources().getStringArray(R.array.volume_stream_titles);
if (STREAMS.length == titles.length) {
mStreamTitles = titles;
} else if (STREAMS.length > titles.length) {
Log.e(TAG, String.format("Missing stream titles (found %d, expected %d): "
+ " invalid resources for volume_stream_titles",
titles.length, STREAMS.length));
mStreamTitles = new String[STREAMS.length];
System.arraycopy(titles, 0, mStreamTitles, 0, titles.length);
for (int i = titles.length ; i < STREAMS.length ; i++) {
mStreamTitles[i] = "";
}
} else { // STREAMS.length < titles.length
Log.e(TAG, String.format("Too many stream titles (found %d, expected %d): "
+ " invalid resources for volume_stream_titles",
titles.length, STREAMS.length));
mStreamTitles = new String[STREAMS.length];
System.arraycopy(titles, 0, mStreamTitles, 0, STREAMS.length);
}
mVibrator = (Vibrator) mContext.getSystemService(Context.VIBRATOR_SERVICE);
mHasVibrator = mVibrator != null && mVibrator.hasVibrator();
}