commit 079912a7deb6bc5dce3fa6f1ca9b5a0dab039eea
author Srikanth Chintala <srikchin@codeaurora.org> Thu Mar 03 16:35:01 2016 +0530
committer Srikanth Chintala <srikchin@codeaurora.org> Wed Feb 08 17:48:19 2017 +0530
tree d935eba44c4a89ac652ef26995bab0cabc5e3a2c
parent 8538b04bfe088cad2ca4d9ecab77b94df46f1322

Retrieve phone object properly.

getPhone() method in PhoneGlobals accepts subscription id
as argument, but in current implementation its called with
phone id as argument and hence it always returns default phone
object which is not correct.
Hence use PhoneFactory.getPhone() which accepts phoneid as
argument.

Test: manual - tested ECBM on both slots
Bug: 34919091
Change-Id: Icfed0957cfd89f04c5c1c1e81079edfbfc45864d

src/com/android/phone/PhoneGlobals.java

diff --git a/src/com/android/phone/PhoneGlobals.java b/src/com/android/phone/PhoneGlobals.java
index cec5a76..fae712a 100644
--- a/src/com/android/phone/PhoneGlobals.java
+++ b/src/com/android/phone/PhoneGlobals.java
@@ -767,7 +767,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)) {