Return null constructing a malformed PhoneAccountHandle

Return null when constructing a PhoneAccountHandle if the ComponentName
from the database is malformed.

Bug: 26684527
Change-Id: I76a3e61699e0646cdf0b715d7b3908611cdca8ff

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);
     }