OSDN Git Service

fix branch break by adding carrierconfig key
authorJordan Liu <jminjie@google.com>
Wed, 7 Sep 2016 19:01:24 +0000 (12:01 -0700)
committerJordan Liu <jminjie@google.com>
Thu, 29 Sep 2016 22:25:46 +0000 (15:25 -0700)
commite787323e030600f3556fba0950ed5de680cc4e77
tree15dccb082475e6676a7d577326b936ed4d150f52
parent5b65b132b3b6a8e2c173c0d581dc1aba0186059c
fix branch break by adding carrierconfig key

Add KEY_CDMA_3WAYCALL_FLASH_DELAY_INT and default value to
CarrierConfigManager

Bug: 29873049
Change-Id: I53dc93defbfa7d1366e6ee066638d73df03f88d0
telephony/java/android/telephony/CarrierConfigManager.java