Merge "expose callerInfo to systemAPI" (f71573ff) · Commits · e / os / android_packages_services_Telecomm

src/com/android/server/telecom/Call.java

+5 −5

Original line number	Diff line number	Diff line
		@@ -56,7 +56,7 @@ import android.widget.Toast;

		import com.android.internal.annotations.VisibleForTesting;
		import com.android.internal.telecom.IVideoProvider;
		import com.android.internal.telephony.CallerInfo;
		import android.telephony.CallerInfo;
		import com.android.internal.telephony.SmsApplication;
		import com.android.internal.util.Preconditions;

		@@ -1135,11 +1135,11 @@ public class Call implements CreateConnectionResponse, EventManager.Loggable,
		}

		public String getName() {
		return mCallerInfo == null ? null : mCallerInfo.name;
		return mCallerInfo == null ? null : mCallerInfo.getName();
		}

		public String getPhoneNumber() {
		return mCallerInfo == null ? null : mCallerInfo.phoneNumber;
		return mCallerInfo == null ? null : mCallerInfo.getPhoneNumber();
		}

		public Bitmap getPhotoIcon() {
		@@ -2293,7 +2293,7 @@ public class Call implements CreateConnectionResponse, EventManager.Loggable,
		if (mCallerInfo == null \|\| !mCallerInfo.contactExists) {
		return getHandle();
		}
		return Contacts.getLookupUri(mCallerInfo.contactIdOrZero, mCallerInfo.lookupKey);
		return Contacts.getLookupUri(mCallerInfo.getContactId(), mCallerInfo.lookupKey);
		}

		Uri getRingtone() {
		@@ -2726,7 +2726,7 @@ public class Call implements CreateConnectionResponse, EventManager.Loggable,
		mCallerInfo = callerInfo;
		Log.i(this, "CallerInfo received for %s: %s", Log.piiHandle(mHandle), callerInfo);

		if (mCallerInfo.contactDisplayPhotoUri == null \|\|
		if (mCallerInfo.getContactDisplayPhotoUri() == null \|\|
		mCallerInfo.cachedPhotoIcon != null \|\| mCallerInfo.cachedPhoto != null) {
		for (Listener l : mListeners) {
		l.onCallerInfoChanged(this);

src/com/android/server/telecom/CallLogManager.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -41,7 +41,7 @@ import android.telephony.SubscriptionManager;

		// TODO: Needed for move to system service: import com.android.internal.R;
		import com.android.internal.annotations.VisibleForTesting;
		import com.android.internal.telephony.CallerInfo;
		import android.telephony.CallerInfo;
		import com.android.server.telecom.callfiltering.CallFilteringResult;

		import java.util.Arrays;

src/com/android/server/telecom/CallerInfoAsyncQueryFactory.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -15,7 +15,7 @@
		*/
		package com.android.server.telecom;

		import com.android.internal.telephony.CallerInfoAsyncQuery;
		import android.telephony.CallerInfoAsyncQuery;

		import android.content.Context;

src/com/android/server/telecom/CallerInfoLookupHelper.java

+4 −7

Original line number	Diff line number	Diff line
		@@ -18,8 +18,6 @@ package com.android.server.telecom;

		import android.annotation.Nullable;
		import android.content.Context;
		import android.graphics.Bitmap;
		import android.graphics.drawable.Drawable;
		import android.net.Uri;
		import android.os.Handler;
		import android.os.Looper;
		@@ -30,10 +28,9 @@ import android.text.TextUtils;
		import android.util.Pair;

		import com.android.internal.annotations.VisibleForTesting;
		import com.android.internal.telephony.CallerInfo;
		import com.android.internal.telephony.CallerInfoAsyncQuery;
		import android.telephony.CallerInfo;
		import android.telephony.CallerInfoAsyncQuery;

		import java.io.InputStream;
		import java.util.HashMap;
		import java.util.LinkedList;
		import java.util.List;
		@@ -194,14 +191,14 @@ public class CallerInfoLookupHelper {
		for (OnQueryCompleteListener l : info.listeners) {
		l.onCallerInfoQueryComplete(handle, ci);
		}
		if (ci.contactDisplayPhotoUri == null) {
		if (ci.getContactDisplayPhotoUri() == null) {
		Log.i(CallerInfoLookupHelper.this, "There is no photo for this " +
		"contact, skipping photo query");
		mQueryEntries.remove(handle);
		} else {
		info.callerInfo = ci;
		info.imageQueryPending = true;
		startPhotoLookup(handle, ci.contactDisplayPhotoUri);
		startPhotoLookup(handle, ci.getContactDisplayPhotoUri());
		}
		} else {
		Log.i(CallerInfoLookupHelper.this, "CI query for handle %s has completed," +

src/com/android/server/telecom/CallsManager.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -69,7 +69,7 @@ import android.util.Pair;

		import com.android.internal.annotations.VisibleForTesting;
		import com.android.internal.telephony.AsyncEmergencyContactNotifier;
		import com.android.internal.telephony.CallerInfo;
		import android.telephony.CallerInfo;
		import com.android.internal.telephony.PhoneConstants;
		import com.android.internal.telephony.TelephonyProperties;
		import com.android.internal.util.IndentingPrintWriter;