Support carrier id in SIM_APN_URI
In order to support backward compatibility, SIM_APN_URI only queries
based on MNO or MVNO APN in Android Q. To support the carrier ID in
Android R, but the APN added by the user only has MCC/MNC(SIM_APN_URI
should return the APN added by user and OEM). Therefore, the SIM_APN_URI
will query based on the MNO or MVNO APN and then append the APN based
on the carrier ID.
Bug: 143931670
Test: atest TelephonyProviderTests
Change-Id: Ia8288568c2dca12bd4e8cef729d35c732a230f67
2 files changed