diff options
author | twyen <twyen@google.com> | 2018-03-19 14:47:28 -0700 |
---|---|---|
committer | Copybara-Service <copybara-piper@google.com> | 2018-03-19 15:22:34 -0700 |
commit | e931c12468e5558b1516f6eaea154d4844040a79 (patch) | |
tree | 8475b4a61d7d637dd3aa41f258e29d4e1e4f5f49 /java/com/android/dialer/app | |
parent | 6f80c367c2579fc6829fc68bed9b5c8d220709b6 (diff) |
Check null for getPhoneAccount()
A phone account can be removed after calling getCallCapablePhoneAccounts(), so subsequent getPhoneAccount() can be null.
Other usages already has the null check.
Bug: 75598828
Test: N/A testing this involves getPhoneAccount() returning null on the nth call, which requires replacing the shadows with a mock and is highly coupled with the implementation. The is an edge case and is not worth the effort and brittleness it will cause.
PiperOrigin-RevId: 189644833
Change-Id: Ie92dda2537befb5936ad734954b4eaf75964f465
Diffstat (limited to 'java/com/android/dialer/app')
-rw-r--r-- | java/com/android/dialer/app/calllog/LegacyVoicemailNotifier.java | 7 | ||||
-rw-r--r-- | java/com/android/dialer/app/settings/DialerSettingsActivity.java | 3 |
2 files changed, 7 insertions, 3 deletions
diff --git a/java/com/android/dialer/app/calllog/LegacyVoicemailNotifier.java b/java/com/android/dialer/app/calllog/LegacyVoicemailNotifier.java index 7b1536b37..f37d52d68 100644 --- a/java/com/android/dialer/app/calllog/LegacyVoicemailNotifier.java +++ b/java/com/android/dialer/app/calllog/LegacyVoicemailNotifier.java @@ -141,13 +141,14 @@ public final class LegacyVoicemailNotifier { if (TelecomUtil.getCallCapablePhoneAccounts(context).size() > 1) { TelecomManager telecomManager = context.getSystemService(TelecomManager.class); PhoneAccount phoneAccount = telecomManager.getPhoneAccount(handle); - return phoneAccount.getShortDescription().toString(); - } else { + if (phoneAccount != null) { + return phoneAccount.getShortDescription().toString(); + } + } return String.format( context.getString(R.string.notification_voicemail_text_format), PhoneNumberHelper.formatNumber( context, voicemailNumber, GeoUtil.getCurrentCountryIso(context))); - } } public static void cancelNotification( diff --git a/java/com/android/dialer/app/settings/DialerSettingsActivity.java b/java/com/android/dialer/app/settings/DialerSettingsActivity.java index 24e5fe8aa..09fe03ef5 100644 --- a/java/com/android/dialer/app/settings/DialerSettingsActivity.java +++ b/java/com/android/dialer/app/settings/DialerSettingsActivity.java @@ -241,6 +241,9 @@ public class DialerSettingsActivity extends AppCompatPreferenceActivity { PhoneAccountHandle result = null; for (PhoneAccountHandle phoneAccountHandle : telecomManager.getCallCapablePhoneAccounts()) { PhoneAccount phoneAccount = telecomManager.getPhoneAccount(phoneAccountHandle); + if (phoneAccount == null) { + continue; + } if (phoneAccount.hasCapabilities(PhoneAccount.CAPABILITY_SIM_SUBSCRIPTION)) { LogUtil.i( "DialerSettingsActivity.getSoleSimAccount", phoneAccountHandle + " is a SIM account"); |