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

Merge "Change data types on CallIdentification API." am: 016982ae2f

Browse Source 
am: d29c7d63a2

Change-Id: I902f8f14350567973ab007b407bfe72ef90c2b2d
This commit is contained in:
Tyler Gunn
2019-02-25 11:00:58 -08:00
committed by android-build-merger
parent 2b5f9c6b20 d29c7d63a2
commit 0b0d3022ee
3 changed files with 50 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -783,7 +783,7 @@ public class CallLog {
String postDialDigits, String viaNumber, int presentation, int callType,
int features, PhoneAccountHandle accountHandle, long start, int duration,
Long dataUsage, boolean addForAllUsers, UserHandle userToBeInsertedTo,
boolean isRead, int callBlockReason, String callScreeningAppName,
boolean isRead, int callBlockReason, CharSequence callScreeningAppName,
String callScreeningComponentName, CallIdentification callIdentification) {
if (VERBOSE_LOG) {
Log.v(LOG_TAG, String.format("Add call: number=%s, user=%s, for all=%s",
@@ -836,15 +836,19 @@ public class CallLog {
}
values.put(BLOCK_REASON, callBlockReason);
values.put(CALL_SCREENING_APP_NAME, callScreeningAppName);
values.put(CALL_SCREENING_APP_NAME, charSequenceToString(callScreeningAppName));
values.put(CALL_SCREENING_COMPONENT_NAME, callScreeningComponentName);
if (callIdentification != null) {
values.put(CALL_ID_PACKAGE_NAME, callIdentification.getCallScreeningPackageName());
values.put(CALL_ID_APP_NAME, callIdentification.getCallScreeningAppName());
values.put(CALL_ID_NAME, callIdentification.getName());
values.put(CALL_ID_DESCRIPTION, callIdentification.getDescription());
values.put(CALL_ID_DETAILS, callIdentification.getDetails());
values.put(CALL_ID_APP_NAME,
charSequenceToString(callIdentification.getCallScreeningAppName()));
values.put(CALL_ID_NAME,
charSequenceToString(callIdentification.getName()));
values.put(CALL_ID_DESCRIPTION,
charSequenceToString(callIdentification.getDescription()));
values.put(CALL_ID_DETAILS,
charSequenceToString(callIdentification.getDetails()));
values.put(CALL_ID_NUISANCE_CONFIDENCE, callIdentification.getNuisanceConfidence());
} else {
values.putNull(CALL_ID_PACKAGE_NAME);
@@ -987,6 +991,10 @@ public class CallLog {
return result;
}
private static String charSequenceToString(CharSequence sequence) {
return sequence == null ? null : sequence.toString();
}
/** @hide */
public static boolean shouldHaveSharedCallLogEntries(Context context,
UserManager userManager, int userId) {