diff options
| author | Nathan Harold <nharold@google.com> | 2020-03-26 13:08:32 -0700 |
|---|---|---|
| committer | Nathan Harold <nharold@google.com> | 2020-04-03 15:25:03 -0700 |
| commit | 8f19e4f21f858ef31075f6163b4ffff43a4420c9 (patch) | |
| tree | 8753502a2724fd810bfa9c4bf28b99283aca1755 /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | afa19b5208dd7189d865c95f2f8a1d5df66699c9 (diff) | |
Check HIDL Discriminator for CSG Info
ART throws an exception if an unpopulated safe union element
is accessed at runtime, so instead we have to check the
hidl_discriminator to see whether the element is populated
before trying to access it (and thus we skip the null check).
Bug: 152486447
Test: atest testCellIdentityLte_1_5_CsgInfo \
testCellIdentityWcdma_1_5_CsgInfo \
testCellIdentityTdscdma_1_5_CsgInfo
Merged-In: I08dc0d2050a9f4d4b574178e1c68a23d015768e4
Change-Id: I08dc0d2050a9f4d4b574178e1c68a23d015768e4
(cherry picked from commit f85a2e9220cb523dcb8c05d04a7bcb8b2cfcaf6d)
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions