release-request-81b48854-d0e0-49af-bcf2-857273cbb8dc-for-git_oc-mr1-release-43... (09eb1032) · Commits · e / os / android_packages_services_Telecomm

res/xml/layout_blocked_number.xml

+2 −2

Original line number	Diff line number	Diff line
		@@ -28,8 +28,8 @@
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_alignParentStart="true"
		android:layout_toStartOf="@+id/delete_blocked_number"
		android:paddingTop="@dimen/blocked_numbers_delete_icon_padding" />
		android:paddingTop="@dimen/blocked_numbers_delete_icon_padding"
		android:textDirection="ltr" />

		<ImageView
		android:id="@+id/delete_blocked_number"

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

+62 −30

Original line number	Diff line number	Diff line
		@@ -27,6 +27,7 @@ import android.os.Looper;
		import android.os.ParcelFileDescriptor;
		import android.os.Parcelable;
		import android.os.RemoteException;
		import android.os.SystemClock;
		import android.os.Trace;
		import android.provider.ContactsContract.Contacts;
		import android.telecom.CallAudioState;
		@@ -242,17 +243,38 @@ public class Call implements CreateConnectionResponse, EventManager.Loggable {
		private String mViaNumber = "";

		/**
		* The time this call was created. Beyond logging and such, may also be used for bookkeeping
		* and specifically for marking certain call attempts as failed attempts.
		* The wall clock time this call was created. Beyond logging and such, may also be used for
		* bookkeeping and specifically for marking certain call attempts as failed attempts.
		* Note: This timestamp should NOT be used for calculating call duration.
		*/
		private long mCreationTimeMillis = System.currentTimeMillis();
		private long mCreationTimeMillis;

		/** The time this call was made active. */
		private long mConnectTimeMillis = 0;

		/** The time this call was disconnected. */
		/**
		* The time, in millis, since boot when this call was connected. This should ONLY be used when
		* calculating the duration of the call.
		*
		* The reason for this is that the {@link SystemClock#elapsedRealtime()} is based on the
		* elapsed time since the device was booted. Changes to the system clock (e.g. due to NITZ
		* time sync, time zone changes user initiated clock changes) would cause a duration calculated
		* based on {@link #mConnectTimeMillis} to change based on the delta in the time.
		* Using the {@link SystemClock#elapsedRealtime()} ensures that changes to the wall clock do
		* not impact the call duration.
		*/
		private long mConnectElapsedTimeMillis = 0;

		/** The wall clock time this call was disconnected. */
		private long mDisconnectTimeMillis = 0;

		/**
		* The elapsed time since boot when this call was disconnected. Recorded as the
		* {@link SystemClock#elapsedRealtime()}. This ensures that the call duration is not impacted
		* by changes in the wall time clock.
		*/
		private long mDisconnectElapsedTimeMillis = 0;

		/** The gateway information associated with this call. This stores the original call handle
		* that the user is attempting to connect to via the gateway, the actual handle to dial in
		* order to connect the call via the gateway, as well as the package name of the gateway
		@@ -376,6 +398,7 @@ public class Call implements CreateConnectionResponse, EventManager.Loggable {
		private final ConnectionServiceRepository mRepository;
		private final Context mContext;
		private final CallsManager mCallsManager;
		private final ClockProxy mClockProxy;
		private final TelecomSystem.SyncRoot mLock;
		private final String mId;
		private String mConnectionId;
		@@ -471,7 +494,6 @@ public class Call implements CreateConnectionResponse, EventManager.Loggable {

		/**
		* Persists the specified parameters and initializes the new instance.
		*
		* @param context The context.
		* @param repository The connection service repository.
		* @param handle The handle to dial.
		@@ -484,7 +506,7 @@ public class Call implements CreateConnectionResponse, EventManager.Loggable {
		* @param callDirection one of CALL_DIRECTION_INCOMING, CALL_DIRECTION_OUTGOING,
		* or CALL_DIRECTION_UNKNOWN.
		* @param shouldAttachToExistingConnection Set to true to attach the call to an existing
		* connection, regardless of whether it's incoming or outgoing.
		* @param clockProxy
		*/
		public Call(
		String callId,
		@@ -501,7 +523,8 @@ public class Call implements CreateConnectionResponse, EventManager.Loggable {
		PhoneAccountHandle targetPhoneAccountHandle,
		int callDirection,
		boolean shouldAttachToExistingConnection,
		boolean isConference) {
		boolean isConference,
		ClockProxy clockProxy) {
		mId = callId;
		mConnectionId = callId;
		mState = isConference ? CallState.ACTIVE : CallState.NEW;
		@@ -522,12 +545,12 @@ public class Call implements CreateConnectionResponse, EventManager.Loggable {
		\|\| callDirection == CALL_DIRECTION_INCOMING;
		maybeLoadCannedSmsResponses();
		mAnalytics = new Analytics.CallInfo();

		mClockProxy = clockProxy;
		mCreationTimeMillis = mClockProxy.currentTimeMillis();
		}

		/**
		* Persists the specified parameters and initializes the new instance.
		*
		* @param context The context.
		* @param repository The connection service repository.
		* @param handle The handle to dial.
		@@ -542,6 +565,7 @@ public class Call implements CreateConnectionResponse, EventManager.Loggable {
		* @param shouldAttachToExistingConnection Set to true to attach the call to an existing
		* connection, regardless of whether it's incoming or outgoing.
		* @param connectTimeMillis The connection time of the call.
		* @param clockProxy
		*/
		Call(
		String callId,
		@@ -559,13 +583,16 @@ public class Call implements CreateConnectionResponse, EventManager.Loggable {
		int callDirection,
		boolean shouldAttachToExistingConnection,
		boolean isConference,
		long connectTimeMillis) {
		long connectTimeMillis,
		long connectElapsedTimeMillis,
		ClockProxy clockProxy) {
		this(callId, context, callsManager, lock, repository, contactsAsyncHelper,
		callerInfoAsyncQueryFactory, phoneNumberUtilsAdapter, handle, gatewayInfo,
		connectionManagerPhoneAccountHandle, targetPhoneAccountHandle, callDirection,
		shouldAttachToExistingConnection, isConference);
		shouldAttachToExistingConnection, isConference, clockProxy);

		mConnectTimeMillis = connectTimeMillis;
		mConnectElapsedTimeMillis = connectElapsedTimeMillis;
		mAnalytics.setCallStartTime(connectTimeMillis);
		}

		@@ -790,14 +817,17 @@ public class Call implements CreateConnectionResponse, EventManager.Loggable {
		// We check to see if mConnectTime is already set to prevent the
		// call from resetting active time when it goes in and out of
		// ACTIVE/ON_HOLD
		mConnectTimeMillis = System.currentTimeMillis();
		mConnectTimeMillis = mClockProxy.currentTimeMillis();
		mConnectElapsedTimeMillis = mClockProxy.elapsedRealtime();
		mAnalytics.setCallStartTime(mConnectTimeMillis);
		}

		// We're clearly not disconnected, so reset the disconnected time.
		mDisconnectTimeMillis = 0;
		mDisconnectElapsedTimeMillis = 0;
		} else if (mState == CallState.DISCONNECTED) {
		mDisconnectTimeMillis = System.currentTimeMillis();
		mDisconnectTimeMillis = mClockProxy.currentTimeMillis();
		mDisconnectElapsedTimeMillis = mClockProxy.elapsedRealtime();
		mAnalytics.setCallEndTime(mDisconnectTimeMillis);
		setLocallyDisconnecting(false);
		fixParentAfterDisconnect();
		@@ -1200,9 +1230,11 @@ public class Call implements CreateConnectionResponse, EventManager.Loggable {
		}

		/**
		* Note: This method relies on {@link #mConnectElapsedTimeMillis} and
		* {@link #mDisconnectElapsedTimeMillis} which are independent of the wall clock (which could
		* change due to clock changes).
		* @return The "age" of this call object in milliseconds, which typically also represents the
		* period since this call was added to the set pending outgoing calls, see
		* mCreationTimeMillis.
		* period since this call was added to the set pending outgoing calls.
		*/
		@VisibleForTesting
		public long getAgeMillis() {
		@@ -1211,16 +1243,16 @@ public class Call implements CreateConnectionResponse, EventManager.Loggable {
		mDisconnectCause.getCode() == DisconnectCause.MISSED)) {
		// Rejected and missed calls have no age. They're immortal!!
		return 0;
		} else if (mConnectTimeMillis == 0) {
		} else if (mConnectElapsedTimeMillis == 0) {
		// Age is measured in the amount of time the call was active. A zero connect time
		// indicates that we never went active, so return 0 for the age.
		return 0;
		} else if (mDisconnectTimeMillis == 0) {
		} else if (mDisconnectElapsedTimeMillis == 0) {
		// We connected, but have not yet disconnected
		return System.currentTimeMillis() - mConnectTimeMillis;
		return mClockProxy.elapsedRealtime() - mConnectElapsedTimeMillis;
		}

		return mDisconnectTimeMillis - mConnectTimeMillis;
		return mDisconnectElapsedTimeMillis - mConnectElapsedTimeMillis;
		}

		/**

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

+20 −9

Original line number	Diff line number	Diff line
		@@ -257,6 +257,7 @@ public class CallsManager extends Call.ListenerBase
		private final DefaultDialerCache mDefaultDialerCache;
		private final Timeouts.Adapter mTimeoutsAdapter;
		private final PhoneNumberUtilsAdapter mPhoneNumberUtilsAdapter;
		private final ClockProxy mClockProxy;
		private final Set<Call> mLocallyDisconnectingCalls = new HashSet<>();
		private final Set<Call> mPendingCallsToDisconnect = new HashSet<>();
		/* Handler tied to thread in which CallManager was initialized. */
		@@ -306,7 +307,8 @@ public class CallsManager extends Call.ListenerBase
		AsyncRingtonePlayer asyncRingtonePlayer,
		PhoneNumberUtilsAdapter phoneNumberUtilsAdapter,
		EmergencyCallHelper emergencyCallHelper,
		InCallTonePlayer.ToneGeneratorFactory toneGeneratorFactory) {
		InCallTonePlayer.ToneGeneratorFactory toneGeneratorFactory,
		ClockProxy clockProxy) {
		mContext = context;
		mLock = lock;
		mPhoneNumberUtilsAdapter = phoneNumberUtilsAdapter;
		@@ -370,6 +372,7 @@ public class CallsManager extends Call.ListenerBase
		mConnectionServiceRepository =
		new ConnectionServiceRepository(mPhoneAccountRegistrar, mContext, mLock, this);
		mInCallWakeLockController = inCallWakeLockControllerFactory.create(context, this);
		mClockProxy = clockProxy;

		mListeners.add(mInCallWakeLockController);
		mListeners.add(statusBarNotifier);
		@@ -833,8 +836,8 @@ public class CallsManager extends Call.ListenerBase
		phoneAccountHandle,
		Call.CALL_DIRECTION_INCOMING /* callDirection */,
		false /* forceAttachToExistingConnection */,
		false /* isConference */
		);
		false, /* isConference */
		mClockProxy);

		// Ensure new calls related to self-managed calls/connections are set as such. This will
		// be overridden when the actual connection is returned in startCreateConnection, however
		@@ -967,8 +970,8 @@ public class CallsManager extends Call.ListenerBase
		// Use onCreateIncomingConnection in TelephonyConnectionService, so that we attach
		// to the existing connection instead of trying to create a new one.
		true /* forceAttachToExistingConnection */,
		false /* isConference */
		);
		false, /* isConference */
		mClockProxy);
		call.initAnalytics();

		setIntentExtrasAndStartTime(call, extras);
		@@ -1047,8 +1050,8 @@ public class CallsManager extends Call.ListenerBase
		null /* phoneAccountHandle */,
		Call.CALL_DIRECTION_OUTGOING /* callDirection */,
		false /* forceAttachToExistingConnection */,
		false /* isConference */
		);
		false, /* isConference */
		mClockProxy);
		call.initAnalytics();

		// Ensure new calls related to self-managed calls/connections are set as such. This
		@@ -2023,6 +2026,10 @@ public class CallsManager extends Call.ListenerBase
		parcelableConference.getConnectTimeMillis() ==
		Conference.CONNECT_TIME_NOT_SPECIFIED ? 0 :
		parcelableConference.getConnectTimeMillis();
		long connectElapsedTime =
		parcelableConference.getConnectElapsedTimeMillis() ==
		Conference.CONNECT_TIME_NOT_SPECIFIED ? 0 :
		parcelableConference.getConnectElapsedTimeMillis();

		Call call = new Call(
		callId,
		@@ -2040,7 +2047,9 @@ public class CallsManager extends Call.ListenerBase
		Call.CALL_DIRECTION_UNDEFINED /* callDirection */,
		false /* forceAttachToExistingConnection */,
		true /* isConference */,
		connectTime);
		connectTime,
		connectElapsedTime,
		mClockProxy);

		setCallState(call, Call.getStateFromConnectionState(parcelableConference.getState()),
		"new conference call");
		@@ -2707,7 +2716,9 @@ public class CallsManager extends Call.ListenerBase
		Call.CALL_DIRECTION_UNDEFINED /* callDirection */,
		false /* forceAttachToExistingConnection */,
		isDowngradedConference /* isConference */,
		connection.getConnectTimeMillis() /* connectTimeMillis */);
		connection.getConnectTimeMillis() /* connectTimeMillis */,
		connection.getConnectElapsedTimeMillis(), /* connectElapsedTimeMillis */
		mClockProxy);

		call.initAnalytics();
		call.getAnalytics().setCreatedFromExistingConnection(true);

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

0 → 100644

+39 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2017 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License
		*/

		package com.android.server.telecom;

		import android.os.SystemClock;

		/**
		* Defines common clock functionality used in Telecom. Provided to make unit testing of clock
		* operations testable.
		*/
		public interface ClockProxy {
		/**
		* Returns the current wall-clock time of the system, as typically returned by
		* {@link System#currentTimeMillis()}.
		* @return The current wall-clock time.
		*/
		long currentTimeMillis();

		/**
		* Returns the elapsed time since boot of the system, as typically returned by
		* {@link SystemClock#elapsedRealtime()}.
		* @return the current elapsed real time.
		*/
		long elapsedRealtime();
		}

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

+4 −3

Original line number	Diff line number	Diff line
		@@ -22,7 +22,6 @@ import com.android.server.telecom.bluetooth.BluetoothRouteManager;
		import com.android.server.telecom.components.UserCallIntentProcessor;
		import com.android.server.telecom.components.UserCallIntentProcessorFactory;
		import com.android.server.telecom.ui.IncomingCallNotifier;
		import com.android.server.telecom.ui.IncomingCallNotifier.IncomingCallNotifierFactory;
		import com.android.server.telecom.ui.MissedCallNotifierImpl.MissedCallNotifierImplFactory;
		import com.android.server.telecom.BluetoothPhoneServiceImpl.BluetoothPhoneServiceImplFactory;
		import com.android.server.telecom.CallAudioManager.AudioServiceFactory;
		@@ -190,7 +189,8 @@ public class TelecomSystem {
		AsyncRingtonePlayer asyncRingtonePlayer,
		PhoneNumberUtilsAdapter phoneNumberUtilsAdapter,
		IncomingCallNotifier incomingCallNotifier,
		InCallTonePlayer.ToneGeneratorFactory toneGeneratorFactory) {
		InCallTonePlayer.ToneGeneratorFactory toneGeneratorFactory,
		ClockProxy clockProxy) {
		mContext = context.getApplicationContext();
		LogUtils.initLogging(mContext);
		DefaultDialerManagerAdapter defaultDialerAdapter =
		@@ -255,7 +255,8 @@ public class TelecomSystem {
		asyncRingtonePlayer,
		phoneNumberUtilsAdapter,
		emergencyCallHelper,
		toneGeneratorFactory);
		toneGeneratorFactory,
		clockProxy);

		mIncomingCallNotifier = incomingCallNotifier;
		incomingCallNotifier.setCallsManagerProxy(new IncomingCallNotifier.CallsManagerProxy() {