commit b0ab4fce6da389687f47ed5d2174206cedec32c9
author Pankaj Kanwar <pkanwar@google.com> Mon Feb 27 16:40:22 2017 +0000
committer android-build-merger <android-build-merger@google.com> Mon Feb 27 16:40:22 2017 +0000
tree 867dbdfee3dcc7af3b26282213182bc7030db69e
parent 9d84f9e15193f4f3106d1ea87293b7fd7490643d
parent 1efb148f8d6bbed5e03cfc307938e44ca60cbba3

Merge "Retrieve phone object properly."
am: 1efb148f8d

Change-Id: I9dc76cde79a679214aef848d334ae55564443d04

src/com/android/phone/PhoneGlobals.java

diff --git a/src/com/android/phone/PhoneGlobals.java b/src/com/android/phone/PhoneGlobals.java
index 842eb06..5008604 100644
--- a/src/com/android/phone/PhoneGlobals.java
+++ b/src/com/android/phone/PhoneGlobals.java
@@ -695,7 +695,7 @@
                 handleServiceStateChanged(intent);
             } else if (action.equals(TelephonyIntents.ACTION_EMERGENCY_CALLBACK_MODE_CHANGED)) {
                 int phoneId = intent.getIntExtra(PhoneConstants.PHONE_KEY, 0);
-                phoneInEcm = getPhone(phoneId);
+                phoneInEcm = PhoneFactory.getPhone(phoneId);
                 Log.d(LOG_TAG, "Emergency Callback Mode. phoneId:" + phoneId);
                 if (phoneInEcm != null) {
                     if (TelephonyCapabilities.supportsEcm(phoneInEcm)) {