Merge "Update language to comply with Android's inclusive language guidance" (5c0929bd) · Commits · e / os / android_packages_services_Telecomm

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -543,7 +543,7 @@ public class Call implements CreateConnectionResponse, EventManager.Loggable,
		private ParcelFileDescriptor[] mConnectionServiceToInCallStreams;

		/**
		* True if we're supposed to start this call with RTT, either due to the master switch or due
		* True if we're supposed to start this call with RTT, either due to the settings switch or due
		* to an extra.
		*/
		private boolean mDidRequestToStartWithRtt = false;

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

+2 −1

Original line number	Diff line number	Diff line
		@@ -605,7 +605,8 @@ public final class CallLogManager extends CallsManagerListenerBase {
		for (int i = 0; i < result.length; i++) {
		Uri uri = result[i];
		/*
		Performs a simple sanity check to make sure the call was written in the database.
		Performs a simple correctness check to make sure the call was written in the
		database.
		Typically there is only one result per call so it is easy to identify which one
		failed.
		*/

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

+2 −2

Original line number	Diff line number	Diff line
		@@ -3924,7 +3924,7 @@ public class CallsManager extends Call.ListenerBase
		+ " livecall = " + liveCall);

		if (emergencyCall == liveCall) {
		// Not likely, but a good sanity check.
		// Not likely, but a good correctness check.
		return true;
		}

		@@ -3938,7 +3938,7 @@ public class CallsManager extends Call.ListenerBase
		return true;
		}
		if (outgoingCall.getState() == CallState.SELECT_PHONE_ACCOUNT) {
		// Sanity check: if there is an orphaned emergency call in the
		// Correctness check: if there is an orphaned emergency call in the
		// {@link CallState#SELECT_PHONE_ACCOUNT} state, just disconnect it since the user
		// has explicitly started a new call.
		emergencyCall.getAnalytics().setCallIsAdditional(true);

testapps/src/com/android/server/telecom/testapps/TestConnectionManager.java

+0 −1

Original line number	Diff line number	Diff line
		@@ -37,7 +37,6 @@ import java.util.Map;

		/**
		* Service which acts as a fake ConnectionManager if so configured.
		* TODO(santoscordon): Rename all classes in the directory to Dummy* (e.g., DummyConnectionService).
		*/
		public class TestConnectionManager extends ConnectionService {
		public final class TestManagedConnection extends Connection {

testapps/src/com/android/server/telecom/testapps/TestConnectionService.java

+4 −5

Original line number	Diff line number	Diff line
		@@ -53,7 +53,6 @@ import static com.android.server.telecom.testapps.CallServiceNotifier.SIM_SUBSCR

		/**
		* Service which provides fake calls to test the ConnectionService interface.
		* TODO: Rename all classes in the directory to Dummy* (e.g., DummyConnectionService).
		*/
		public class TestConnectionService extends ConnectionService {
		/**
		@@ -430,9 +429,9 @@ public class TestConnectionService extends ConnectionService {
		int videoState = extras.getInt(EXTRA_START_VIDEO_STATE, VideoProfile.STATE_AUDIO_ONLY);
		Uri providedHandle = extras.getParcelable(EXTRA_HANDLE);

		// Use dummy number for testing incoming calls.
		// Use test number for testing incoming calls.
		Uri address = providedHandle == null ?
		Uri.fromParts(PhoneAccount.SCHEME_TEL, getDummyNumber(
		Uri.fromParts(PhoneAccount.SCHEME_TEL, getRandomNumber(
		VideoProfile.isVideo(videoState)), null)
		: providedHandle;
		connection.setVideoState(videoState);
		@@ -480,7 +479,7 @@ public class TestConnectionService extends ConnectionService {
		final Uri providedHandle = extras.getParcelable(EXTRA_HANDLE);

		Uri handle = providedHandle == null ?
		Uri.fromParts(PhoneAccount.SCHEME_TEL, getDummyNumber(false), null)
		Uri.fromParts(PhoneAccount.SCHEME_TEL, getRandomNumber(false), null)
		: providedHandle;

		connection.setAddress(handle, TelecomManager.PRESENTATION_ALLOWED);
		@@ -613,7 +612,7 @@ public class TestConnectionService extends ConnectionService {
		* @param isVideo {@code True} if the call is a video call.
		* @return The phone number.
		*/
		private String getDummyNumber(boolean isVideo) {
		private String getRandomNumber(boolean isVideo) {
		int videoDigit = isVideo ? 1 : 0;
		int number = mRandom.nextInt(999);
		return String.format("555%s%03d", videoDigit, number);