Merge "Change data types on CallIdentification API." (d490ce14) · Commits · e / os / android_frameworks_base

api/current.txt

+7 −7

Original line number	Diff line number	Diff line
		@@ -43341,11 +43341,11 @@ package android.telecom {

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

core/java/android/provider/CallLog.java

+14 −6

Original line number	Diff line number	Diff line
		@@ -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) {

telecomm/java/android/telecom/CallIdentification.java

+29 −30

Original line number	Diff line number	Diff line
		@@ -45,13 +45,13 @@ public final class CallIdentification implements Parcelable {
		* {@link CallIdentification} for a screened call.
		*/
		public static class Builder {
		private String mName;
		private String mDescription;
		private String mDetails;
		private CharSequence mName;
		private CharSequence mDescription;
		private CharSequence mDetails;
		private Icon mPhoto;
		private int mNuisanceConfidence = CallIdentification.CONFIDENCE_UNKNOWN;
		private String mPackageName;
		private String mAppName;
		private CharSequence mAppName;

		/**
		* Default builder constructor.
		@@ -67,7 +67,7 @@ public final class CallIdentification implements Parcelable {
		* @param callIdAppName The app name.
		* @hide
		*/
		public Builder(String callIdPackageName, String callIdAppName) {
		public Builder(String callIdPackageName, CharSequence callIdAppName) {
		mPackageName = callIdPackageName;
		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.
		* @return Builder instance.
		*/
		public Builder setName(@Nullable String name) {
		public Builder setName(@Nullable CharSequence name) {
		mName = name;
		return this;
		}
		@@ -97,7 +97,7 @@ public final class CallIdentification implements Parcelable {
		* @param description The call description, or {@code null} if none is provided.
		* @return Builder instance.
		*/
		public Builder setDescription(@Nullable String description) {
		public Builder setDescription(@Nullable CharSequence description) {
		mDescription = description;
		return this;
		}
		@@ -114,7 +114,7 @@ public final class CallIdentification implements Parcelable {
		* @param details The call details, or {@code null} if none is provided.
		* @return Builder instance.
		*/
		public Builder setDetails(@Nullable String details) {
		public Builder setDetails(@Nullable CharSequence details) {
		mDetails = details;
		return this;
		}
		@@ -241,10 +241,10 @@ public final class CallIdentification implements Parcelable {
		* call identification.
		* @hide
		*/
		private CallIdentification(@Nullable String name, @Nullable String description,
		@Nullable String details, @Nullable Icon photo,
		private CallIdentification(@Nullable CharSequence name, @Nullable CharSequence description,
		@Nullable CharSequence details, @Nullable Icon photo,
		@NuisanceConfidence int nuisanceConfidence, @NonNull String callScreeningPackageName,
		@NonNull String callScreeningAppName) {
		@NonNull CharSequence callScreeningAppName) {
		mName = name;
		mDescription = description;
		mDetails = details;
		@@ -254,13 +254,13 @@ public final class CallIdentification implements Parcelable {
		mCallScreeningPackageName = callScreeningPackageName;
		}

		private String mName;
		private String mDescription;
		private String mDetails;
		private CharSequence mName;
		private CharSequence mDescription;
		private CharSequence mDetails;
		private Icon mPhoto;
		private int mNuisanceConfidence;
		private String mCallScreeningPackageName;
		private String mCallScreeningAppName;
		private CharSequence mCallScreeningAppName;

		@Override
		public int describeContents() {
		@@ -269,13 +269,13 @@ public final class CallIdentification implements Parcelable {

		@Override
		public void writeToParcel(Parcel parcel, int i) {
		parcel.writeString(mName);
		parcel.writeString(mDescription);
		parcel.writeString(mDetails);
		parcel.writeCharSequence(mName);
		parcel.writeCharSequence(mDescription);
		parcel.writeCharSequence(mDetails);
		parcel.writeParcelable(mPhoto, 0);
		parcel.writeInt(mNuisanceConfidence);
		parcel.writeString(mCallScreeningPackageName);
		parcel.writeString(mCallScreeningAppName);
		parcel.writeCharSequence(mCallScreeningAppName);
		}

		/**
		@@ -286,13 +286,13 @@ public final class CallIdentification implements Parcelable {

		@Override
		public CallIdentification createFromParcel(Parcel source) {
		String name = source.readString();
		String description = source.readString();
		String details = source.readString();
		CharSequence name = source.readCharSequence();
		CharSequence description = source.readCharSequence();
		CharSequence details = source.readCharSequence();
		Icon photo = source.readParcelable(ClassLoader.getSystemClassLoader());
		int nuisanceConfidence = source.readInt();
		String callScreeningPackageName = source.readString();
		String callScreeningAppName = source.readString();
		CharSequence callScreeningAppName = source.readCharSequence();
		return new CallIdentification(name, description, details, photo,
		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.
		*/
		public final @Nullable String getName() {
		public final @Nullable CharSequence getName() {
		return mName;
		}

		@@ -325,7 +325,7 @@ public final class CallIdentification implements Parcelable {
		*
		* @return The call description, or {@code null} if none was provided.
		*/
		public final @Nullable String getDescription() {
		public final @Nullable CharSequence getDescription() {
		return mDescription;
		}

		@@ -340,7 +340,7 @@ public final class CallIdentification implements Parcelable {
		*
		* @return The call details, or {@code null} if none was provided.
		*/
		public final @Nullable String getDetails() {
		public final @Nullable CharSequence getDetails() {
		return mDetails;
		}

		@@ -363,8 +363,7 @@ public final class CallIdentification implements Parcelable {
		*
		* @return The nuisance confidence.
		*/
		public final @NuisanceConfidence
		int getNuisanceConfidence() {
		public final @NuisanceConfidence int getNuisanceConfidence() {
		return mNuisanceConfidence;
		}

		@@ -387,7 +386,7 @@ public final class CallIdentification implements Parcelable {
		*
		* @return The name of the app.
		*/
		public final @NonNull String getCallScreeningAppName() {
		public final @NonNull CharSequence getCallScreeningAppName() {
		return mCallScreeningAppName;
		}

		@@ -407,7 +406,7 @@ public final class CallIdentification implements Parcelable {
		* @param callScreeningAppName The app name.
		* @hide
		*/
		public void setCallScreeningAppName(@NonNull String callScreeningAppName) {
		public void setCallScreeningAppName(@NonNull CharSequence callScreeningAppName) {
		mCallScreeningAppName = callScreeningAppName;
		}