commit d9a5fa50bd06780d118a497a5418f4a327e79da1
author Treehugger Robot <treehugger-gerrit@google.com> Fri Jan 27 00:21:55 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Jan 27 00:21:56 2017 +0000
tree 485a5b8e2d50ec1009dd79ca73d924fb339cf0b3
parent 36bbab16d4cd6c70093badd2333da892106b6dd8
parent 518a7dd41c829677ae4575939cba9815b984db7d

Merge "Fix potential NPE from 326226"

src/com/android/server/telecom/CallLogManager.java

diff --git a/src/com/android/server/telecom/CallLogManager.java b/src/com/android/server/telecom/CallLogManager.java
index d89f54a..15a4f58 100755
--- a/src/com/android/server/telecom/CallLogManager.java
+++ b/src/com/android/server/telecom/CallLogManager.java
@@ -263,7 +263,8 @@
         boolean okToLogEmergencyNumber = false;
         CarrierConfigManager configManager = (CarrierConfigManager) mContext.getSystemService(
                 Context.CARRIER_CONFIG_SERVICE);
-        PersistableBundle configBundle = configManager.getConfig();
+        PersistableBundle configBundle = configManager.getConfigForSubId(
+                mPhoneAccountRegistrar.getSubscriptionIdForPhoneAccount(accountHandle));
         if (configBundle != null) {
             okToLogEmergencyNumber = configBundle.getBoolean(
                     CarrierConfigManager.KEY_ALLOW_EMERGENCY_NUMBERS_IN_CALL_LOG_BOOL);