From 64ba7ccfacc75e0733de64c4df2be9f25aa811cb Mon Sep 17 00:00:00 2001 From: roldenburg Date: Wed, 21 Jun 2017 12:15:03 -0700 Subject: Make Lightbringer getPackageName Nullable An empty string isn't as clear and can lead to incorrectly matching other intents when just comparing package names. PiperOrigin-RevId: 159725546 Change-Id: I2943b3569fb6409f5c69deb2032f3d8248f6c14d --- java/com/android/dialer/app/calllog/CallLogListItemViewHolder.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'java/com/android/dialer/app') diff --git a/java/com/android/dialer/app/calllog/CallLogListItemViewHolder.java b/java/com/android/dialer/app/calllog/CallLogListItemViewHolder.java index 79c00e483..b8b029f7b 100644 --- a/java/com/android/dialer/app/calllog/CallLogListItemViewHolder.java +++ b/java/com/android/dialer/app/calllog/CallLogListItemViewHolder.java @@ -877,7 +877,7 @@ public final class CallLogListItemViewHolder extends RecyclerView.ViewHolder // We check to see if we are starting a Lightbringer intent. The reason is Lightbringer // intents need to be started using startActivityForResult instead of the usual startActivity String packageName = intent.getPackage(); - if (getLightbringer().getPackageName().equals(packageName)) { + if (packageName != null && packageName.equals(getLightbringer().getPackageName())) { startLightbringerActivity(intent); } else if (CallDetailsActivity.isLaunchIntent(intent)) { PerformanceReport.recordClick(UiAction.Type.OPEN_CALL_DETAIL); -- cgit v1.2.3