diff options
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/provider/CallLog.java | 92 |
1 files changed, 3 insertions, 89 deletions
diff --git a/core/java/android/provider/CallLog.java b/core/java/android/provider/CallLog.java index 44adc1c5cba4..ef28f07e817f 100644 --- a/core/java/android/provider/CallLog.java +++ b/core/java/android/provider/CallLog.java @@ -35,7 +35,6 @@ import android.provider.ContactsContract.CommonDataKinds.Callable; import android.provider.ContactsContract.CommonDataKinds.Phone; import android.provider.ContactsContract.Data; import android.provider.ContactsContract.DataUsageFeedback; -import android.telecom.CallIdentification; import android.telecom.PhoneAccount; import android.telecom.PhoneAccountHandle; import android.telecom.TelecomManager; @@ -605,69 +604,6 @@ public class CallLog { public static final String BLOCK_REASON = "block_reason"; /** - * The package name of the {@link android.telecom.CallScreeningService} which provided - * {@link android.telecom.CallIdentification} for this call. - * <P>Type: TEXT</P> - */ - public static final String CALL_ID_PACKAGE_NAME = "call_id_package_name"; - - /** - * The app name of the {@link android.telecom.CallScreeningService} which provided - * {@link android.telecom.CallIdentification} for this call. - * <P>Type: TEXT</P> - */ - public static final String CALL_ID_APP_NAME = "call_id_app_name"; - - /** - * The {@link CallIdentification#getName() name} of a call, as provided by the - * {@link android.telecom.CallScreeningService}. - * <p> - * The name is provided by the app identified by {@link #CALL_ID_PACKAGE_NAME} and - * {@link #CALL_ID_APP_NAME}. - * <P>Type: TEXT</P> - */ - public static final String CALL_ID_NAME = "call_id_name"; - - /** - * The {@link CallIdentification#getDescription() description} of a call, as provided by the - * {@link android.telecom.CallScreeningService}. - * <p> - * The description is provided by the app identified by {@link #CALL_ID_PACKAGE_NAME} and - * {@link #CALL_ID_APP_NAME}. - * <P>Type: TEXT</P> - */ - public static final String CALL_ID_DESCRIPTION = "call_id_description"; - - /** - * The {@link CallIdentification#getDetails() details} of a call, as provided by the - * {@link android.telecom.CallScreeningService}. - * <p> - * The details field is provided by the app identified by {@link #CALL_ID_PACKAGE_NAME} and - * {@link #CALL_ID_APP_NAME}. - * <P>Type: TEXT</P> - */ - public static final String CALL_ID_DETAILS = "call_id_details"; - - /** - * The {@link CallIdentification#getNuisanceConfidence() nuisance confidence} of a call, as - * provided by the {@link android.telecom.CallScreeningService}. - * <p> - * Valid values are defined in {@link CallIdentification}, and include: - * <ul> - * <li>{@link CallIdentification#CONFIDENCE_NOT_NUISANCE}</li> - * <li>{@link CallIdentification#CONFIDENCE_LIKELY_NOT_NUISANCE}</li> - * <li>{@link CallIdentification#CONFIDENCE_UNKNOWN}</li> - * <li>{@link CallIdentification#CONFIDENCE_LIKELY_NUISANCE}</li> - * <li>{@link CallIdentification#CONFIDENCE_NUISANCE}</li> - * </ul> - * <p> - * The nuisance confidence is provided by the app identified by - * {@link #CALL_ID_PACKAGE_NAME} and {@link #CALL_ID_APP_NAME}. - * <P>Type: INTEGER</P> - */ - public static final String CALL_ID_NUISANCE_CONFIDENCE = "call_id_nuisance_confidence"; - - /** * Adds a call to the call log. * * @param ci the CallerInfo object to get the target contact from. Can be null @@ -696,8 +632,7 @@ public class CallLog { presentation, callType, features, accountHandle, start, duration, dataUsage, false /* addForAllUsers */, null /* userToBeInsertedTo */, false /* isRead */, Calls.BLOCK_REASON_NOT_BLOCKED /* callBlockReason */, - null /* callScreeningAppName */, null /* callScreeningComponentName */, - null /* callIdentification */); + null /* callScreeningAppName */, null /* callScreeningComponentName */); } @@ -737,8 +672,7 @@ public class CallLog { features, accountHandle, start, duration, dataUsage, addForAllUsers, userToBeInsertedTo, false /* isRead */ , Calls.BLOCK_REASON_NOT_BLOCKED /* callBlockReason */, null /* callScreeningAppName */, - null /* callScreeningComponentName */, - null /* callIdentification */); + null /* callScreeningComponentName */); } /** @@ -784,7 +718,7 @@ public class CallLog { int features, PhoneAccountHandle accountHandle, long start, int duration, Long dataUsage, boolean addForAllUsers, UserHandle userToBeInsertedTo, boolean isRead, int callBlockReason, CharSequence callScreeningAppName, - String callScreeningComponentName, CallIdentification callIdentification) { + String callScreeningComponentName) { if (VERBOSE_LOG) { Log.v(LOG_TAG, String.format("Add call: number=%s, user=%s, for all=%s", number, userToBeInsertedTo, addForAllUsers)); @@ -839,26 +773,6 @@ public class CallLog { 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, - 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); - values.putNull(CALL_ID_APP_NAME); - values.putNull(CALL_ID_NAME); - values.putNull(CALL_ID_DESCRIPTION); - values.putNull(CALL_ID_DETAILS); - values.putNull(CALL_ID_NUISANCE_CONFIDENCE); - } - if ((ci != null) && (ci.contactIdOrZero > 0)) { // Update usage information for the number associated with the contact ID. // We need to use both the number and the ID for obtaining a data ID since other |