commit | c2d74ddc6fa38ea28b2984f32f41a92e18243009 | [log] [tgz] |
---|---|---|
author | Andy McFadden <fadden@android.com> | Mon Oct 25 16:13:46 2010 -0700 |
committer | Andy McFadden <fadden@android.com> | Mon Oct 25 16:29:41 2010 -0700 |
tree | 96acbd45aa58bee1ba39d2e94f1690ab68271794 | |
parent | 78b06ea60c4ff7134cc688ca869d85248d7f4255 [diff] |
Correct verifier merging of primitive arrays Merging of primitive array types (e.g. float[][] + String[]) was being handled by the general-purpose type merge, which was determining the result to be an Object. It should have been an Object[]. This changes the verifier to treat arrays of primitive as arrays, but with one fewer dimension. Bug: 3130586 Change-Id: I35a6c27256f69f142fa2a8c22bc5f995096c9ae1