commit bd285fe82999e8c37eb231d20871199e53210d44
author Tony Mak <tonymak@google.com> Wed May 04 17:03:45 2016 +0100
committer Tony Mak <tonymak@google.com> Wed May 04 16:43:27 2016 +0000
tree 1200f539b618d45a6a049da61fe32d09f98ab174
parent 629864c882436075eb3404f9e62897ed6676c912

Crash upon selecting "Calling Accounts" in work Dialer

PhoneFactory is not inited in managed profile.
We need to call getSubIdForPhoneAccount in user 0 through TelephonyManager
Also, it is cleaner to move out the setting out of the telephony package
to avoid this happen again, but it is a bit late at this moment

Change-Id: I07d518d3550efdf1aa3a75af9ea91e80dd64bfcc
Fix: 28582158

src/com/android/phone/settings/PhoneAccountSettingsFragment.java

diff --git a/src/com/android/phone/settings/PhoneAccountSettingsFragment.java b/src/com/android/phone/settings/PhoneAccountSettingsFragment.java
index 25c0f95..77de3f5 100644
--- a/src/com/android/phone/settings/PhoneAccountSettingsFragment.java
+++ b/src/com/android/phone/settings/PhoneAccountSettingsFragment.java
@@ -306,8 +306,8 @@
                     retval = isSim1 ? -1 : 1;
                 }
 
-                int subId1 = PhoneUtils.getSubIdForPhoneAccount(account1);
-                int subId2 = PhoneUtils.getSubIdForPhoneAccount(account2);
+                int subId1 = mTelephonyManager.getSubIdForPhoneAccount(account1);
+                int subId2 = mTelephonyManager.getSubIdForPhoneAccount(account2);
                 if (subId1 != SubscriptionManager.INVALID_SUBSCRIPTION_ID &&
                         subId2 != SubscriptionManager.INVALID_SUBSCRIPTION_ID) {
                     retval = (mSubscriptionManager.getSlotId(subId1) <