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

Merge "Change data types on CallIdentification API."

Browse Source 
am: 016982ae2f

Change-Id: Iec1145872d3be9d042391ccb973e8cdfe8b2e40f
This commit is contained in:
Tyler Gunn
2019-02-22 13:37:46 -08:00
committed by android-build-merger
parent 2a1c372131 016982ae2f
commit d29c7d63a2
3 changed files with 50 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
api/current.txt
View File

@@ -41246,11 +41246,11 @@ package android.telecom {
public final class CallIdentification implements android.os.Parcelable { public final class CallIdentification implements android.os.Parcelable {
method public int describeContents(); method public int describeContents();
method @NonNull public String getCallScreeningAppName(); method @NonNull public CharSequence getCallScreeningAppName();
method @NonNull public String getCallScreeningPackageName(); method @NonNull public String getCallScreeningPackageName();
method @Nullable public String getDescription(); method @Nullable public CharSequence getDescription();
method @Nullable public String getDetails(); method @Nullable public CharSequence getDetails();
method @Nullable public String getName(); method @Nullable public CharSequence getName();
method public int getNuisanceConfidence(); method public int getNuisanceConfidence();
method @Nullable public android.graphics.drawable.Icon getPhoto(); method @Nullable public android.graphics.drawable.Icon getPhoto();
method public void writeToParcel(android.os.Parcel, int); method public void writeToParcel(android.os.Parcel, int);
@@ -41265,9 +41265,9 @@ package android.telecom {
public static class CallIdentification.Builder { public static class CallIdentification.Builder {
ctor public CallIdentification.Builder(); ctor public CallIdentification.Builder();
method public android.telecom.CallIdentification build(); method public android.telecom.CallIdentification build();
method public android.telecom.CallIdentification.Builder setDescription(@Nullable String); method public android.telecom.CallIdentification.Builder setDescription(@Nullable CharSequence);
method public android.telecom.CallIdentification.Builder setDetails(@Nullable String); method public android.telecom.CallIdentification.Builder setDetails(@Nullable CharSequence);
method public android.telecom.CallIdentification.Builder setName(@Nullable String); method public android.telecom.CallIdentification.Builder setName(@Nullable CharSequence);
method public android.telecom.CallIdentification.Builder setNuisanceConfidence(int); method public android.telecom.CallIdentification.Builder setNuisanceConfidence(int);
method public android.telecom.CallIdentification.Builder setPhoto(@Nullable android.graphics.drawable.Icon); method public android.telecom.CallIdentification.Builder setPhoto(@Nullable android.graphics.drawable.Icon);
} }

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

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

59
telecomm/java/android/telecom/CallIdentification.java
View File

@@ -45,13 +45,13 @@ public final class CallIdentification implements Parcelable {
* {@link CallIdentification} for a screened call. * {@link CallIdentification} for a screened call.
*/ */
public static class Builder { public static class Builder {
private String mName; private CharSequence mName;
private String mDescription; private CharSequence mDescription;
private String mDetails; private CharSequence mDetails;
private Icon mPhoto; private Icon mPhoto;
private int mNuisanceConfidence = CallIdentification.CONFIDENCE_UNKNOWN; private int mNuisanceConfidence = CallIdentification.CONFIDENCE_UNKNOWN;
private String mPackageName; private String mPackageName;
private String mAppName; private CharSequence mAppName;
/** /**
* Default builder constructor. * Default builder constructor.
@@ -67,7 +67,7 @@ public final class CallIdentification implements Parcelable {
* @param callIdAppName The app name. * @param callIdAppName The app name.
* @hide * @hide
*/ */
public Builder(String callIdPackageName, String callIdAppName) { public Builder(String callIdPackageName, CharSequence callIdAppName) {
mPackageName = callIdPackageName; mPackageName = callIdPackageName;
mAppName = callIdAppName; mAppName = callIdAppName;
} }
@@ -80,7 +80,7 @@ public final class CallIdentification implements Parcelable {
* @param name The name associated with the call, or {@code null} if none is provided. * @param name The name associated with the call, or {@code null} if none is provided.
* @return Builder instance. * @return Builder instance.
*/ */
public Builder setName(@Nullable String name) { public Builder setName(@Nullable CharSequence name) {
mName = name; mName = name;
return this; return this;
} }
@@ -97,7 +97,7 @@ public final class CallIdentification implements Parcelable {
* @param description The call description, or {@code null} if none is provided. * @param description The call description, or {@code null} if none is provided.
* @return Builder instance. * @return Builder instance.
*/ */
public Builder setDescription(@Nullable String description) { public Builder setDescription(@Nullable CharSequence description) {
mDescription = description; mDescription = description;
return this; return this;
} }
@@ -114,7 +114,7 @@ public final class CallIdentification implements Parcelable {
* @param details The call details, or {@code null} if none is provided. * @param details The call details, or {@code null} if none is provided.
* @return Builder instance. * @return Builder instance.
*/ */
public Builder setDetails(@Nullable String details) { public Builder setDetails(@Nullable CharSequence details) {
mDetails = details; mDetails = details;
return this; return this;
} }
@@ -241,10 +241,10 @@ public final class CallIdentification implements Parcelable {
* call identification. * call identification.
* @hide * @hide
*/ */
private CallIdentification(@Nullable String name, @Nullable String description, private CallIdentification(@Nullable CharSequence name, @Nullable CharSequence description,
@Nullable String details, @Nullable Icon photo, @Nullable CharSequence details, @Nullable Icon photo,
@NuisanceConfidence int nuisanceConfidence, @NonNull String callScreeningPackageName, @NuisanceConfidence int nuisanceConfidence, @NonNull String callScreeningPackageName,
@NonNull String callScreeningAppName) { @NonNull CharSequence callScreeningAppName) {
mName = name; mName = name;
mDescription = description; mDescription = description;
mDetails = details; mDetails = details;
@@ -254,13 +254,13 @@ public final class CallIdentification implements Parcelable {
mCallScreeningPackageName = callScreeningPackageName; mCallScreeningPackageName = callScreeningPackageName;
} }
private String mName; private CharSequence mName;
private String mDescription; private CharSequence mDescription;
private String mDetails; private CharSequence mDetails;
private Icon mPhoto; private Icon mPhoto;
private int mNuisanceConfidence; private int mNuisanceConfidence;
private String mCallScreeningPackageName; private String mCallScreeningPackageName;
private String mCallScreeningAppName; private CharSequence mCallScreeningAppName;
@Override @Override
public int describeContents() { public int describeContents() {
@@ -269,13 +269,13 @@ public final class CallIdentification implements Parcelable {
@Override @Override
public void writeToParcel(Parcel parcel, int i) { public void writeToParcel(Parcel parcel, int i) {
parcel.writeString(mName); parcel.writeCharSequence(mName);
parcel.writeString(mDescription); parcel.writeCharSequence(mDescription);
parcel.writeString(mDetails); parcel.writeCharSequence(mDetails);
parcel.writeParcelable(mPhoto, 0); parcel.writeParcelable(mPhoto, 0);
parcel.writeInt(mNuisanceConfidence); parcel.writeInt(mNuisanceConfidence);
parcel.writeString(mCallScreeningPackageName); parcel.writeString(mCallScreeningPackageName);
parcel.writeString(mCallScreeningAppName); parcel.writeCharSequence(mCallScreeningAppName);
} }
/** /**
@@ -286,13 +286,13 @@ public final class CallIdentification implements Parcelable {
@Override @Override
public CallIdentification createFromParcel(Parcel source) { public CallIdentification createFromParcel(Parcel source) {
String name = source.readString(); CharSequence name = source.readCharSequence();
String description = source.readString(); CharSequence description = source.readCharSequence();
String details = source.readString(); CharSequence details = source.readCharSequence();
Icon photo = source.readParcelable(ClassLoader.getSystemClassLoader()); Icon photo = source.readParcelable(ClassLoader.getSystemClassLoader());
int nuisanceConfidence = source.readInt(); int nuisanceConfidence = source.readInt();
String callScreeningPackageName = source.readString(); String callScreeningPackageName = source.readString();
String callScreeningAppName = source.readString(); CharSequence callScreeningAppName = source.readCharSequence();
return new CallIdentification(name, description, details, photo, return new CallIdentification(name, description, details, photo,
nuisanceConfidence, callScreeningPackageName, callScreeningAppName); nuisanceConfidence, callScreeningPackageName, callScreeningAppName);
} }
@@ -311,7 +311,7 @@ public final class CallIdentification implements Parcelable {
* *
* @return The name associated with the number, or {@code null} if none was provided. * @return The name associated with the number, or {@code null} if none was provided.
*/ */
public final @Nullable String getName() { public final @Nullable CharSequence getName() {
return mName; return mName;
} }
@@ -325,7 +325,7 @@ public final class CallIdentification implements Parcelable {
* *
* @return The call description, or {@code null} if none was provided. * @return The call description, or {@code null} if none was provided.
*/ */
public final @Nullable String getDescription() { public final @Nullable CharSequence getDescription() {
return mDescription; return mDescription;
} }
@@ -340,7 +340,7 @@ public final class CallIdentification implements Parcelable {
* *
* @return The call details, or {@code null} if none was provided. * @return The call details, or {@code null} if none was provided.
*/ */
public final @Nullable String getDetails() { public final @Nullable CharSequence getDetails() {
return mDetails; return mDetails;
} }
@@ -363,8 +363,7 @@ public final class CallIdentification implements Parcelable {
* *
* @return The nuisance confidence. * @return The nuisance confidence.
*/ */
public final @NuisanceConfidence public final @NuisanceConfidence int getNuisanceConfidence() {
int getNuisanceConfidence() {
return mNuisanceConfidence; return mNuisanceConfidence;
} }
@@ -387,7 +386,7 @@ public final class CallIdentification implements Parcelable {
* *
* @return The name of the app. * @return The name of the app.
*/ */
public final @NonNull String getCallScreeningAppName() { public final @NonNull CharSequence getCallScreeningAppName() {
return mCallScreeningAppName; return mCallScreeningAppName;
} }
@@ -407,7 +406,7 @@ public final class CallIdentification implements Parcelable {
* @param callScreeningAppName The app name. * @param callScreeningAppName The app name.
* @hide * @hide
*/ */
public void setCallScreeningAppName(@NonNull String callScreeningAppName) { public void setCallScreeningAppName(@NonNull CharSequence callScreeningAppName) {
mCallScreeningAppName = callScreeningAppName; mCallScreeningAppName = callScreeningAppName;
} }