tree 70820a2e79ce922af234d3a33a00a292c5ee95f0
parent 76756cfa83e778930a9c4e20d6c5dc8fada8f5bc
author calvinpan <calvinpan@google.com> 1572874572 +0800
committer calvinpan <calvinpan@google.com> 1575948067 +0800

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