summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBrad Ebinger <breadley@google.com>2016-03-17 21:42:12 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-03-17 21:42:12 +0000
commitad6fbc0f594341d23f33ccf73c765e9b2dc9adab (patch)
treec9996aadb50f105d3e0bb950056943df19407d83 /src
parent625cc92c3dbfec8d8b6e873cfeb54166f4d2b1f3 (diff)
parentef2fdd5cd215e8e0ff974843ccdddad962dd54db (diff)
Merge "Return null constructing a malformed PhoneAccountHandle" into nyc-dev
am: ef2fdd5 * commit 'ef2fdd5cd215e8e0ff974843ccdddad962dd54db': Return null constructing a malformed PhoneAccountHandle
Diffstat (limited to 'src')
-rw-r--r--src/com/android/dialer/calllog/PhoneAccountUtils.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/com/android/dialer/calllog/PhoneAccountUtils.java b/src/com/android/dialer/calllog/PhoneAccountUtils.java
index 8c3985b3f..b3ce18b3c 100644
--- a/src/com/android/dialer/calllog/PhoneAccountUtils.java
+++ b/src/com/android/dialer/calllog/PhoneAccountUtils.java
@@ -59,6 +59,9 @@ public class PhoneAccountUtils {
return null;
}
final ComponentName componentName = ComponentName.unflattenFromString(componentString);
+ if (componentName == null) {
+ return null;
+ }
return new PhoneAccountHandle(componentName, accountId);
}