diff options
| author | Hongwei Wang <hwwang@google.com> | 2018-02-20 17:47:27 -0800 |
|---|---|---|
| committer | Hongwei Wang <hwwang@google.com> | 2018-02-20 17:47:41 -0800 |
| commit | 4dc649a013dfa61d1990284a07b19c4af22daa90 (patch) | |
| tree | d142d114bb3bf82ba1c7c52fe7372a49701daf3b /tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink | |
| parent | aeed173309f61e653d4e932fcb8c8afb95a46f80 (diff) | |
| download | Car-4dc649a013dfa61d1990284a07b19c4af22daa90.tar.gz | |
Fixed NPE crash from VolumeTestFragment
Test: Launch kitchensink -> volume test
Change-Id: Ia82c8963f4c7936e0a185ed1139fceb46aa18e8f
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 { |