Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge change 9021 into donut

Browse Source 
* changes:
  DO NOT MERGE - Fix CNAP-related NullPointerException
This commit is contained in:
Android (Google) Code Review
2009-07-29 14:52:11 -07:00
parent f4dc9da372 9953eb27ed
commit 3d716ed6a3
1 changed files with 8 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
core/java/android/provider/CallLog.java
View File

@@ -151,34 +151,20 @@ public class CallLog {
int presentation, int callType, long start, int duration) { int presentation, int callType, long start, int duration) {
final ContentResolver resolver = context.getContentResolver(); final ContentResolver resolver = context.getContentResolver();
// TODO(Moto): Which is correct: original code, this only changes the // If this is a private number then set the number to Private, otherwise check
// number if the number is empty and never changes the caller info name. // if the number field is empty and set the number to Unavailable
if (false) {
if (TextUtils.isEmpty(number)) {
if (presentation == Connection.PRESENTATION_RESTRICTED) {
number = CallerInfo.PRIVATE_NUMBER;
} else if (presentation == Connection.PRESENTATION_PAYPHONE) {
number = CallerInfo.PAYPHONE_NUMBER;
} else {
number = CallerInfo.UNKNOWN_NUMBER;
}
}
} else {
// NEWCODE: From Motorola
//If this is a private number then set the number to Private, otherwise check
//if the number field is empty and set the number to Unavailable
if (presentation == Connection.PRESENTATION_RESTRICTED) { if (presentation == Connection.PRESENTATION_RESTRICTED) {
number = CallerInfo.PRIVATE_NUMBER; number = CallerInfo.PRIVATE_NUMBER;
ci.name = ""; if (ci != null) ci.name = "";
} else if (presentation == Connection.PRESENTATION_PAYPHONE) { } else if (presentation == Connection.PRESENTATION_PAYPHONE) {
number = CallerInfo.PAYPHONE_NUMBER; number = CallerInfo.PAYPHONE_NUMBER;
ci.name = ""; if (ci != null) ci.name = "";
} else if (TextUtils.isEmpty(number) || presentation == Connection.PRESENTATION_UNKNOWN) { } else if (TextUtils.isEmpty(number)
|| presentation == Connection.PRESENTATION_UNKNOWN) {
number = CallerInfo.UNKNOWN_NUMBER; number = CallerInfo.UNKNOWN_NUMBER;
ci.name = ""; if (ci != null) ci.name = "";
} }
}
ContentValues values = new ContentValues(5); ContentValues values = new ContentValues(5);
values.put(NUMBER, number); values.put(NUMBER, number);