e04c40c - platform/packages/modules/Telephony

commit: e04c40c70a0827d88a59920c2284aa01ccecdaaa
[log]
author: Hyein Yu <hyeinyu@google.com>
Thu Jul 02 07:59:47 2026 +0000
committer: Android Build Coastguard Worker <android-build-coastguard-worker@google.com>
Mon Jul 13 17:47:47 2026 -0700
tree: 6ad3151e99a8ee4074b611241a55e7c113f2bb5f
parent: d83f23a96fbe6d68942d8d7245dbd3db91e9c711 [diff]

Fix server-triggered StackOverflowError in TS.43 phone number fetch

A deeply nested JSON response could trigger an unbounded recursion in
JSONTokener causing a StackOverflowError, which escaped the Exception
catch block and crashed the process. This changes catch (Exception) to
catch (Throwable) in Ts43PhoneNumberRetriever.java, and also adds catch
(Throwable) in Ts43PhoneNumberController.java to gracefully handle
unexpected Errors.

Bug: 517377722
Test: atest Ts43PhoneNumberRetrieverTest Ts43PhoneNumberControllerTest
Flag: EXEMPT BUGFIX

TAG=agy
CONV=96a2cb83-a901-4037-81da-7fa7df3a933f

(cherry picked from commit de8c73c03104687fdc52e14be9c1baf792c1bef8)
Cherrypick-From: https://googleplex-android-review.googlesource.com/q/commit:332287647dda3657dbc2a4d39b3e72b9090547c7
Merged-In: Ieef53664f3a25a2286c24d0b12c3132cfe94f562
Change-Id: Ieef53664f3a25a2286c24d0b12c3132cfe94f562

4 files changed

tree: 6ad3151e99a8ee4074b611241a55e7c113f2bb5f