commit b5d4cca73c04281f6e0f2b57e5cca6fde9ae6a96
author Pankaj Kanwar <pkanwar@google.com> Mon Feb 27 16:45:22 2017 +0000
committer android-build-merger <android-build-merger@google.com> Mon Feb 27 16:45:22 2017 +0000
tree 8dc12043285f7675eb736d1a11e6ce09b8bd31a2
parent c0bfae6f28245043f4e7df04cf377a8f0749506d
parent 5232b667e2bbda3081c17423ce2c72e5a9fd6f7a

Merge "Retrieve phone object properly." am: 1efb148f8d am: b0ab4fce6d
am: 5232b667e2

Change-Id: I66386eb1d6a1d7e2476fc165513267a146a927f7

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)) {