diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2018-02-22 02:19:27 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-02-22 02:19:27 +0000 |
| commit | fe38d3665e0653cefb7c3d97e4219b34a0563760 (patch) | |
| tree | b6b7afb51ad2f36cb79e0eb4703a75cb12c46e68 /tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink | |
| parent | 097589737433e9b9d742104b63a2868dd954a263 (diff) | |
| parent | 4dc649a013dfa61d1990284a07b19c4af22daa90 (diff) | |
| download | Car-fe38d3665e0653cefb7c3d97e4219b34a0563760.tar.gz | |
Merge "Fixed NPE crash from VolumeTestFragment"
Diffstat (limited to 'tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink')
2 files changed, 4 insertions, 4 deletions
diff --git a/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/volume/VolumeAdapter.java b/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/volume/VolumeAdapter.java index 7b6c9376f4..ec071dc2a8 100644 --- a/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/volume/VolumeAdapter.java +++ b/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/volume/VolumeAdapter.java @@ -36,13 +36,13 @@ public class VolumeAdapter extends ArrayAdapter<VolumeInfo> { private VolumeTestFragment mFragment; - public VolumeAdapter(Context c, int layoutResourceId, VolumeInfo[] locations, + public VolumeAdapter(Context c, int layoutResourceId, VolumeInfo[] volumeList, VolumeTestFragment fragment) { - super(c, layoutResourceId, locations); + super(c, layoutResourceId, volumeList); mFragment = fragment; mContext = c; this.mLayoutResourceId = layoutResourceId; - this.mVolumeList = locations; + this.mVolumeList = volumeList; } @Override diff --git a/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/volume/VolumeTestFragment.java b/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/volume/VolumeTestFragment.java index dedd2aa3d2..2cc8e0c70a 100644 --- a/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/volume/VolumeTestFragment.java +++ b/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/volume/VolumeTestFragment.java @@ -82,7 +82,7 @@ public class VolumeTestFragment extends Fragment { } } - private VolumeInfo[] mVolumeInfos; + private VolumeInfo[] mVolumeInfos = new VolumeInfo[0]; private SparseIntArray mGroupIdIndexMap = new SparseIntArray(); private class AudioFocusListener implements AudioManager.OnAudioFocusChangeListener { |