summaryrefslogtreecommitdiffstats
path: root/java/com/android/contacts
diff options
context:
space:
mode:
authortwyen <twyen@google.com>2018-03-19 14:47:28 -0700
committerCopybara-Service <copybara-piper@google.com>2018-03-19 15:22:34 -0700
commite931c12468e5558b1516f6eaea154d4844040a79 (patch)
tree8475b4a61d7d637dd3aa41f258e29d4e1e4f5f49 /java/com/android/contacts
parent6f80c367c2579fc6829fc68bed9b5c8d220709b6 (diff)
downloadandroid_packages_apps_Dialer-e931c12468e5558b1516f6eaea154d4844040a79.tar.gz
android_packages_apps_Dialer-e931c12468e5558b1516f6eaea154d4844040a79.tar.bz2
android_packages_apps_Dialer-e931c12468e5558b1516f6eaea154d4844040a79.zip
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/contacts')
-rw-r--r--java/com/android/contacts/common/dialog/CallSubjectDialog.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/java/com/android/contacts/common/dialog/CallSubjectDialog.java b/java/com/android/contacts/common/dialog/CallSubjectDialog.java
index 7bc13fe72..48f292cfa 100644
--- a/java/com/android/contacts/common/dialog/CallSubjectDialog.java
+++ b/java/com/android/contacts/common/dialog/CallSubjectDialog.java
@@ -531,6 +531,9 @@ public class CallSubjectDialog extends Activity {
TelecomManager telecomManager = (TelecomManager) getSystemService(Context.TELECOM_SERVICE);
final PhoneAccount account = telecomManager.getPhoneAccount(mPhoneAccountHandle);
+ if (account == null) {
+ return;
+ }
Bundle phoneAccountExtras = account.getExtras();
if (phoneAccountExtras == null) {