diff options
| author | Brad Ebinger <breadley@google.com> | 2016-03-17 21:36:08 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-03-17 21:36:08 +0000 |
| commit | ef2fdd5cd215e8e0ff974843ccdddad962dd54db (patch) | |
| tree | 2b03a3b7b688b02b94e0bd302ef5a95ee2614685 /src/com | |
| parent | 3d7939d20d92047e7ab068ad60901b3a0fd01c1e (diff) | |
| parent | a88667f867735490f60bdbd3f807d984df73d359 (diff) | |
Merge "Return null constructing a malformed PhoneAccountHandle" into nyc-dev
Diffstat (limited to 'src/com')
| -rw-r--r-- | src/com/android/dialer/calllog/PhoneAccountUtils.java | 3 |
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); } |