Skip to content

Possibly fix NPE #258

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
colleirose wants to merge 1 commit into
base: 16
Choose a base branch
from
Open

Possibly fix NPE #258

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions telecomm/java/android/telecom/CallerInfo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -697,12 +697,13 @@ public static String getGeoDescription(Context context, String number) {
+ Log.pii(number) + "'");
}

if (pn != null) {
if (pn == null || locale == null) {
Log.w(TAG, "pn and/or locale was null in getGeoDescription");
return null;
} else {
String description = geocoder.getDescriptionForNumber(pn, locale);
if (VDBG) Log.v(TAG, "- got description: '" + description + "'");
return description;
} else {
return null;
}
}

Expand Down