commit 0137f237fd9157004468b838511e234c243ab8ae
author Jordan Liu <jminjie@google.com> Fri Dec 02 04:46:33 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Dec 02 04:46:41 2016 +0000
tree 3e66ee254339270cf382f0cc59abd99483eebdc3
parent 5c96d6bbf1699ce0dd716ad6b03c40cad3b2c360
parent e6e9406e1427aea4e50654175d186ede7d3a4c18

Merge "Rename key usage to start with "KEY""

src/com/android/services/telephony/TelephonyConnection.java

diff --git a/src/com/android/services/telephony/TelephonyConnection.java b/src/com/android/services/telephony/TelephonyConnection.java
index 30aca49..078b025 100644
--- a/src/com/android/services/telephony/TelephonyConnection.java
+++ b/src/com/android/services/telephony/TelephonyConnection.java
@@ -885,7 +885,7 @@
         String[] filteredCnapNames = null;
         if (carrierConfig != null) {
             filteredCnapNames = carrierConfig.getStringArray(
-                    CarrierConfigManager.FILTERED_CNAP_NAMES_STRING_ARRAY);
+                    CarrierConfigManager.KEY_FILTERED_CNAP_NAMES_STRING_ARRAY);
         }
         if (filteredCnapNames != null) {
             long cnapNameMatches = Arrays.asList(filteredCnapNames)