diff options
author | Brandon Maxwell <maxwelb@google.com> | 2015-12-02 12:55:57 -0800 |
---|---|---|
committer | Brandon Maxwell <maxwelb@google.com> | 2015-12-02 16:22:01 -0800 |
commit | f6bf9e4c680355bf597447bbda043f3b611734d0 (patch) | |
tree | a716ec5fa12c661a25086509a2ec5471bd5ac469 | |
parent | da8da31ec024b7e9b7fb264bc776112513a9edbe (diff) |
Fixing crash related to typing ADN numbers in Dialpad
Bug: 25813349
Change-Id: I3e26ec2edd917df4892d401867acbeb5f97edf64
-rw-r--r-- | src/com/android/dialer/SpecialCharSequenceMgr.java | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/com/android/dialer/SpecialCharSequenceMgr.java b/src/com/android/dialer/SpecialCharSequenceMgr.java index 6ca5ef58e..d9e293888 100644 --- a/src/com/android/dialer/SpecialCharSequenceMgr.java +++ b/src/com/android/dialer/SpecialCharSequenceMgr.java @@ -192,7 +192,6 @@ public class SpecialCharSequenceMgr { * and query cancel handler implemented in {@link SimContactQueryCookie}. */ static boolean handleAdnEntry(Context context, String input, EditText textField) { - context = context.getApplicationContext(); /* ADN entries are of the form "N(N)(N)#" */ TelephonyManager telephonyManager = (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE); @@ -225,7 +224,7 @@ public class SpecialCharSequenceMgr { // the dialer text field. // create the async query handler - final QueryHandler handler = new QueryHandler (context.getContentResolver()); + final QueryHandler handler = new QueryHandler(context.getContentResolver()); // create the cookie object final SimContactQueryCookie sc = new SimContactQueryCookie(index - 1, handler, @@ -248,16 +247,17 @@ public class SpecialCharSequenceMgr { List<PhoneAccountHandle> subscriptionAccountHandles = PhoneAccountUtils.getSubscriptionPhoneAccounts(context); + Context applicationContext = context.getApplicationContext(); boolean hasUserSelectedDefault = subscriptionAccountHandles.contains( - TelecomUtil.getDefaultOutgoingPhoneAccount(context, + TelecomUtil.getDefaultOutgoingPhoneAccount(applicationContext, PhoneAccount.SCHEME_TEL)); if (subscriptionAccountHandles.size() == 1 || hasUserSelectedDefault) { - Uri uri = TelecomUtil.getAdnUriForPhoneAccount(context, null); + Uri uri = TelecomUtil.getAdnUriForPhoneAccount(applicationContext, null); handleAdnQuery(handler, sc, uri); } else if (subscriptionAccountHandles.size() > 1){ - SelectPhoneAccountListener callback = - new HandleAdnEntryAccountSelectedCallback(context, handler, sc); + SelectPhoneAccountListener callback = new HandleAdnEntryAccountSelectedCallback( + applicationContext, handler, sc); DialogFragment dialogFragment = SelectPhoneAccountDialogFragment.newInstance( subscriptionAccountHandles, callback); |