Merge "Add debounce to start of phone call ops" into sc-dev (eafcfb2f) · Commits · e / os / android_packages_services_Telecomm

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

+38 −7

Original line number	Diff line number	Diff line
		@@ -45,6 +45,7 @@ import android.os.RemoteException;
		import android.os.Trace;
		import android.os.UserHandle;
		import android.os.UserManager;
		import android.provider.DeviceConfig;
		import android.telecom.CallAudioState;
		import android.telecom.ConnectionService;
		import android.telecom.InCallService;
		@@ -83,8 +84,8 @@ import java.util.stream.Collectors;
		*/
		public class InCallController extends CallsManagerListenerBase implements
		AppOpsManager.OnOpActiveChangedListener {
		public static final int IN_CALL_SERVICE_NOTIFICATION_ID = 3;
		public static final String NOTIFICATION_TAG = InCallController.class.getSimpleName();
		public static final int IN_CALL_SERVICE_NOTIFICATION_ID = 3;

		public class InCallServiceConnection {
		/**
		@@ -1011,6 +1012,14 @@ public class InCallController extends CallsManagerListenerBase implements
		*/
		private boolean mIsCallUsingMicrophone = false;

		/**
		* {@code true} if InCallController is tracking a managed, not external call which is using the
		* microphone, {@code false} otherwise.
		*/
		private boolean mIsTrackingManagedAliveCall = false;

		private boolean mIsStartCallDelayScheduled = false;

		/**
		* A list of call IDs which are currently using the camera.
		*/
		@@ -2216,16 +2225,38 @@ public class InCallController extends CallsManagerListenerBase implements
		Log.i(this, "trackCallingUserInterfaceStopped: %s is no longer calling UX", packageName);
		}

		private void maybeTrackMicrophoneUse(boolean isMuted) {
		maybeTrackMicrophoneUse(isMuted, false);
		}

		/**
		* As calls are added, removed and change between external and non-external status, track
		* whether the current active calling UX is using the microphone. We assume if there is a
		* managed call present and the mic is not muted that the microphone is in use.
		*/
		private void maybeTrackMicrophoneUse(boolean isMuted) {
		boolean wasTrackingManagedCall = mIsCallUsingMicrophone;
		mIsCallUsingMicrophone = isTrackingManagedAliveCall() && !isMuted
		&& !carrierPrivilegedUsingMicDuringVoipCall();
		if (wasTrackingManagedCall != mIsCallUsingMicrophone) {
		private void maybeTrackMicrophoneUse(boolean isMuted, boolean isScheduledDelay) {
		if (mIsStartCallDelayScheduled && !isScheduledDelay) {
		return;
		}

		mIsStartCallDelayScheduled = false;
		boolean wasUsingMicrophone = mIsCallUsingMicrophone;
		boolean wasTrackingCall = mIsTrackingManagedAliveCall;
		mIsTrackingManagedAliveCall = isTrackingManagedAliveCall();
		if (!wasTrackingCall && mIsTrackingManagedAliveCall) {
		mIsStartCallDelayScheduled = true;
		mHandler.postDelayed(new Runnable("ICC.mTMU", mLock) {
		@Override
		public void loggedRun() {
		maybeTrackMicrophoneUse(isMuted(), true);
		}
		}.prepare(), mTimeoutsAdapter.getCallStartAppOpDebounceIntervalMillis());
		return;
		}

		mIsCallUsingMicrophone = mIsTrackingManagedAliveCall && !isMuted
		&& !isCarrierPrivilegedUsingMicDuringVoipCall();
		if (wasUsingMicrophone != mIsCallUsingMicrophone) {
		if (mIsCallUsingMicrophone) {
		mAppOpsManager.startOp(AppOpsManager.OP_PHONE_CALL_MICROPHONE, myUid(),
		mContext.getOpPackageName(), false, null, null);
		@@ -2246,7 +2277,7 @@ public class InCallController extends CallsManagerListenerBase implements
		c.getState()));
		}

		private boolean carrierPrivilegedUsingMicDuringVoipCall() {
		private boolean isCarrierPrivilegedUsingMicDuringVoipCall() {
		return !mActiveCarrierPrivilegedApps.isEmpty() &&
		mCallIdMapper.getCalls().stream().anyMatch(Call::getIsVoipAudioMode);
		}

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

+9 −0

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

		import android.content.ContentResolver;
		import android.provider.DeviceConfig;
		import android.provider.Settings;
		import android.telecom.CallDiagnosticService;
		import android.telecom.CallRedirectionService;
		@@ -75,6 +76,10 @@ public final class Timeouts {
		public long getCallDiagnosticServiceTimeoutMillis(ContentResolver cr) {
		return Timeouts.getCallDiagnosticServiceTimeoutMillis(cr);
		}

		public long getCallStartAppOpDebounceIntervalMillis() {
		return Timeouts.getCallStartAppOpDebounceIntervalMillis();
		}
		}

		/** A prefix to use for all keys so to not clobber the global namespace. */
		@@ -232,6 +237,10 @@ public final class Timeouts {
		return get(contentResolver, "call_diagnostic_service_timeout", 2000L /* 2 sec */);
		}

		public static long getCallStartAppOpDebounceIntervalMillis() {
		return DeviceConfig.getLong(DeviceConfig.NAMESPACE_PRIVACY, "app_op_debounce_time", 250L);
		}

		/**
		* Returns the number of milliseconds for which the system should exempt the default dialer from
		* power save restrictions due to the dialer needing to handle a missed call notification