tree 72414b0ac5f4bf127258d16480dd1f0cad6cf445
parent 8d63ac49a7a40d780880ba90d28bab9f726667f4
author Susheel nyamala <snyamala@codeaurora.org> 1512658920 +0530
committer Jordan Liu <jminjie@google.com> 1526587592 -0700

Fix apn option display issue for world phone mode

When configs world_phone_bool and show_apn_setting_cdma_bool are enabled,
'Access Point Names' is displayed twice under Network Settings, as this
preference is added from both GsmUmtsOptions and CdmaOptions.
Fix is to add preference from CdmaOptions only if phone type is cdma and
show_apn_setting_cdma_bool config is enabled.

Bug: 70309465
Test: builds, and CdmaOptionsTest.java, manually verify no duplicated
APN expandable preference on CDMA/GSM world phone
Change-Id: Ia89b0b882604e287a996fec86c9c961df704f1e8
Merged-In: Ia89b0b882604e287a996fec86c9c961df704f1e8