Use DefaultDialerCache in Telecom (part 2) (13730254) · Commits · e / os / android_packages_services_Telecomm

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

+12 −7

Original line number	Diff line number	Diff line
		@@ -57,7 +57,6 @@ import com.android.internal.telephony.AsyncEmergencyContactNotifier;
		import com.android.internal.telephony.PhoneConstants;
		import com.android.internal.telephony.TelephonyProperties;
		import com.android.internal.util.IndentingPrintWriter;
		import com.android.server.telecom.TelecomServiceImpl.DefaultDialerManagerAdapter;
		import com.android.server.telecom.callfiltering.AsyncBlockCheckFilter;
		import com.android.server.telecom.callfiltering.BlockCheckerAdapter;
		import com.android.server.telecom.callfiltering.CallFilterResultCallback;
		@@ -193,7 +192,7 @@ public class CallsManager extends Call.ListenerBase
		private final PhoneAccountRegistrar mPhoneAccountRegistrar;
		private final MissedCallNotifier mMissedCallNotifier;
		private final CallerInfoLookupHelper mCallerInfoLookupHelper;
		private final DefaultDialerManagerAdapter mDefaultDialerManagerAdapter;
		private final DefaultDialerCache mDefaultDialerCache;
		private final Timeouts.Adapter mTimeoutsAdapter;
		private final PhoneNumberUtilsAdapter mPhoneNumberUtilsAdapter;
		private final NotificationManager mNotificationManager;
		@@ -225,7 +224,7 @@ public class CallsManager extends Call.ListenerBase
		BluetoothManager bluetoothManager,
		WiredHeadsetManager wiredHeadsetManager,
		SystemStateProvider systemStateProvider,
		DefaultDialerManagerAdapter defaultDialerAdapter,
		DefaultDialerCache defaultDialerCache,
		Timeouts.Adapter timeoutsAdapter,
		AsyncRingtonePlayer asyncRingtonePlayer,
		PhoneNumberUtilsAdapter phoneNumberUtilsAdapter,
		@@ -240,7 +239,7 @@ public class CallsManager extends Call.ListenerBase
		StatusBarNotifier statusBarNotifier = new StatusBarNotifier(context, this);
		mWiredHeadsetManager = wiredHeadsetManager;
		mBluetoothManager = bluetoothManager;
		mDefaultDialerManagerAdapter = defaultDialerAdapter;
		mDefaultDialerCache = defaultDialerCache;
		mDockManager = new DockManager(context);
		mTimeoutsAdapter = timeoutsAdapter;
		mCallerInfoLookupHelper = new CallerInfoLookupHelper(context, mCallerInfoAsyncQueryFactory,
		@@ -275,7 +274,7 @@ public class CallsManager extends Call.ListenerBase
		RingtoneFactory ringtoneFactory = new RingtoneFactory(this, context);
		SystemVibrator systemVibrator = new SystemVibrator(context);
		mInCallController = new InCallController(
		context, mLock, this, systemStateProvider, defaultDialerAdapter, mTimeoutsAdapter);
		context, mLock, this, systemStateProvider, defaultDialerCache, mTimeoutsAdapter);
		mRinger = new Ringer(playerFactory, context, systemSettingsUtil, asyncRingtonePlayer,
		ringtoneFactory, systemVibrator, mInCallController);

		@@ -366,8 +365,7 @@ public class CallsManager extends Call.ListenerBase
		filters.add(new DirectToVoicemailCallFilter(mCallerInfoLookupHelper));
		filters.add(new AsyncBlockCheckFilter(mContext, new BlockCheckerAdapter()));
		filters.add(new CallScreeningServiceFilter(mContext, this, mPhoneAccountRegistrar,
		mDefaultDialerManagerAdapter,
		new ParcelableCallUtils.Converter(), mLock));
		mDefaultDialerCache, new ParcelableCallUtils.Converter(), mLock));
		new IncomingCallFilter(mContext, this, incomingCall, mLock,
		mTimeoutsAdapter, filters).performFiltering();
		}
		@@ -2161,6 +2159,13 @@ public class CallsManager extends Call.ListenerBase
		pw.decreaseIndent();
		}

		if (mDefaultDialerCache != null) {
		pw.println("mDefaultDialerCache:");
		pw.increaseIndent();
		mDefaultDialerCache.dumpCache(pw);
		pw.decreaseIndent();
		}

		if (mConnectionServiceRepository != null) {
		pw.println("mConnectionServiceRepository:");
		pw.increaseIndent();

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

+46 −5

Original line number	Diff line number	Diff line
		@@ -27,14 +27,40 @@ import android.os.Handler;
		import android.os.Looper;
		import android.os.UserHandle;
		import android.provider.Settings;
		import android.telecom.DefaultDialerManager;
		import android.telecom.Log;
		import android.util.SparseArray;

		import com.android.internal.annotations.VisibleForTesting;
		import com.android.internal.util.IndentingPrintWriter;

		import java.util.Objects;

		public class DefaultDialerCache {
		public interface DefaultDialerManagerAdapter {
		String getDefaultDialerApplication(Context context);
		String getDefaultDialerApplication(Context context, int userId);
		boolean setDefaultDialerApplication(Context context, String packageName, int userId);
		}

		static class DefaultDialerManagerAdapterImpl implements DefaultDialerManagerAdapter {
		@Override
		public String getDefaultDialerApplication(Context context) {
		return DefaultDialerManager.getDefaultDialerApplication(context);
		}

		@Override
		public String getDefaultDialerApplication(Context context, int userId) {
		return DefaultDialerManager.getDefaultDialerApplication(context, userId);
		}

		@Override
		public boolean setDefaultDialerApplication(Context context, String packageName,
		int userId) {
		return DefaultDialerManager.setDefaultDialerApplication(context, packageName, userId);
		}
		}

		private static final String LOG_TAG = "DefaultDialerCache";
		private final BroadcastReceiver mReceiver = new BroadcastReceiver() {
		@Override
		@@ -43,7 +69,7 @@ public class DefaultDialerCache {
		try {
		String packageName;
		if (Intent.ACTION_PACKAGE_CHANGED.equals(intent.getAction())) {
		packageName = intent.getData().getSchemeSpecificPart();
		packageName = null;
		} else if (Intent.ACTION_PACKAGE_REMOVED.equals(intent.getAction())
		&& !intent.getBooleanExtra(Intent.EXTRA_REPLACING, false)) {
		packageName = intent.getData().getSchemeSpecificPart();
		@@ -86,13 +112,13 @@ public class DefaultDialerCache {
		};

		private final Context mContext;
		private final TelecomServiceImpl.DefaultDialerManagerAdapter mDefaultDialerManagerAdapter;
		private final DefaultDialerManagerAdapter mDefaultDialerManagerAdapter;
		private final TelecomSystem.SyncRoot mLock;
		private final String mSystemDialerName;
		private SparseArray<String> mCurrentDefaultDialerPerUser = new SparseArray<>();

		public DefaultDialerCache(Context context,
		TelecomServiceImpl.DefaultDialerManagerAdapter defaultDialerManagerAdapter,
		DefaultDialerManagerAdapter defaultDialerManagerAdapter,
		TelecomSystem.SyncRoot lock) {
		mContext = context;
		mDefaultDialerManagerAdapter = defaultDialerManagerAdapter;
		@@ -136,12 +162,18 @@ public class DefaultDialerCache {
		return getDefaultDialerApplication(mContext.getUserId());
		}

		public boolean isDefaultOrSystemDialer(Context context, String packageName) {
		String defaultDialer = getDefaultDialerApplication(context.getUserId());
		public boolean isDefaultOrSystemDialer(String packageName, int userId) {
		String defaultDialer = getDefaultDialerApplication(userId);
		return Objects.equals(packageName, defaultDialer)
		\|\| Objects.equals(packageName, mSystemDialerName);
		}

		public boolean setDefaultDialer(String packageName, int userId) {
		// No need to update cache -- this'll trigger the content observer.
		return mDefaultDialerManagerAdapter.setDefaultDialerApplication(
		mContext, packageName, userId);
		}

		private String refreshCacheForUser(int userId) {
		String currentDefaultDialer =
		mDefaultDialerManagerAdapter.getDefaultDialerApplication(mContext, userId);
		@@ -168,6 +200,15 @@ public class DefaultDialerCache {
		}
		}

		public void dumpCache(IndentingPrintWriter pw) {
		synchronized (mLock) {
		for (int i = 0; i < mCurrentDefaultDialerPerUser.size(); i++) {
		pw.printf("User %d: %s\n", mCurrentDefaultDialerPerUser.keyAt(i),
		mCurrentDefaultDialerPerUser.valueAt(i));
		}
		}
		}

		/**
		* registerContentObserver is really hard to mock out, so here is a getter method for the
		* content observer for testing instead.

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

+7 −8

Original line number	Diff line number	Diff line
		@@ -48,7 +48,6 @@ import com.android.internal.annotations.VisibleForTesting;
		import com.android.internal.telecom.IInCallService;
		import com.android.internal.util.IndentingPrintWriter;
		import com.android.server.telecom.SystemStateProvider.SystemStateListener;
		import com.android.server.telecom.TelecomServiceImpl.DefaultDialerManagerAdapter;

		import java.util.ArrayList;
		import java.util.Collection;
		@@ -614,20 +613,20 @@ public final class InCallController extends CallsManagerListenerBase {
		private final TelecomSystem.SyncRoot mLock;
		private final CallsManager mCallsManager;
		private final SystemStateProvider mSystemStateProvider;
		private final DefaultDialerManagerAdapter mDefaultDialerAdapter;
		private final Timeouts.Adapter mTimeoutsAdapter;
		private final DefaultDialerCache mDefaultDialerCache;
		private CarSwappingInCallServiceConnection mInCallServiceConnection;
		private NonUIInCallServiceConnectionCollection mNonUIInCallServiceConnections;

		public InCallController(Context context, TelecomSystem.SyncRoot lock, CallsManager callsManager,
		SystemStateProvider systemStateProvider,
		DefaultDialerManagerAdapter defaultDialerAdapter, Timeouts.Adapter timeoutsAdapter) {
		DefaultDialerCache defaultDialerCache, Timeouts.Adapter timeoutsAdapter) {
		mContext = context;
		mLock = lock;
		mCallsManager = callsManager;
		mSystemStateProvider = systemStateProvider;
		mDefaultDialerAdapter = defaultDialerAdapter;
		mTimeoutsAdapter = timeoutsAdapter;
		mDefaultDialerCache = defaultDialerCache;

		Resources resources = mContext.getResources();
		mSystemInCallComponentName = new ComponentName(
		@@ -915,8 +914,8 @@ public final class InCallController extends CallsManagerListenerBase {
		}

		private InCallServiceInfo getDefaultDialerComponent() {
		String packageName = mDefaultDialerAdapter.getDefaultDialerApplication(
		mContext, mCallsManager.getCurrentUserHandle().getIdentifier());
		String packageName = mDefaultDialerCache.getDefaultDialerApplication(
		mCallsManager.getCurrentUserHandle().getIdentifier());
		Log.d(this, "Default Dialer package: " + packageName);

		return getInCallServiceComponent(packageName, IN_CALL_SERVICE_TYPE_DIALER_UI);
		@@ -1038,8 +1037,8 @@ public final class InCallController extends CallsManagerListenerBase {

		// Check to see that it is the default dialer package
		boolean isDefaultDialerPackage = Objects.equals(serviceInfo.packageName,
		mDefaultDialerAdapter.getDefaultDialerApplication(
		mContext, mCallsManager.getCurrentUserHandle().getIdentifier()));
		mDefaultDialerCache.getDefaultDialerApplication(
		mCallsManager.getCurrentUserHandle().getIdentifier()));
		boolean isUIService = serviceInfo.metaData != null &&
		serviceInfo.metaData.getBoolean(
		TelecomManager.METADATA_IN_CALL_SERVICE_UI, false);

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

+8 −5

Original line number	Diff line number	Diff line
		@@ -134,6 +134,7 @@ public class PhoneAccountRegistrar {
		private final Context mContext;
		private final UserManager mUserManager;
		private final SubscriptionManager mSubscriptionManager;
		private final DefaultDialerCache mDefaultDialerCache;
		private State mState;
		private UserHandle mCurrentUserHandle;
		private interface PhoneAccountRegistrarWriteLock {}
		@@ -141,12 +142,13 @@ public class PhoneAccountRegistrar {
		new PhoneAccountRegistrarWriteLock() {};

		@VisibleForTesting
		public PhoneAccountRegistrar(Context context) {
		this(context, FILE_NAME);
		public PhoneAccountRegistrar(Context context, DefaultDialerCache defaultDialerCache) {
		this(context, FILE_NAME, defaultDialerCache);
		}

		@VisibleForTesting
		public PhoneAccountRegistrar(Context context, String fileName) {
		public PhoneAccountRegistrar(Context context, String fileName,
		DefaultDialerCache defaultDialerCache) {
		// TODO: This file path is subject to change -- it is storing the phone account registry
		// state file in the path /data/system/users/0/, which is likely not correct in a
		// multi-user setting.
		@@ -160,6 +162,7 @@ public class PhoneAccountRegistrar {
		mState = new State();
		mContext = context;
		mUserManager = UserManager.get(context);
		mDefaultDialerCache = defaultDialerCache;
		mSubscriptionManager = SubscriptionManager.from(mContext);
		mCurrentUserHandle = Process.myUserHandle();
		read();
		@@ -363,8 +366,8 @@ public class PhoneAccountRegistrar {
		*/
		public PhoneAccountHandle getSimCallManager(UserHandle userHandle) {
		// Get the default dialer in case it has a connection manager associated with it.
		String dialerPackage = DefaultDialerManager
		.getDefaultDialerApplication(mContext, userHandle.getIdentifier());
		String dialerPackage = mDefaultDialerCache
		.getDefaultDialerApplication(userHandle.getIdentifier());

		// Check carrier config.
		ComponentName systemSimCallManagerComponent = getSystemSimCallManagerComponent();

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

+10 −39

Original line number	Diff line number	Diff line
		@@ -37,7 +37,6 @@ import android.os.Binder;
		import android.os.Bundle;
		import android.os.Process;
		import android.os.UserHandle;
		import android.os.UserManager;
		import android.telecom.DefaultDialerManager;
		import android.telecom.Log;
		import android.telecom.ParcelableCallAnalytics;
		@@ -58,6 +57,7 @@ import com.android.server.telecom.settings.BlockedNumbersActivity;

		import java.io.FileDescriptor;
		import java.io.PrintWriter;
		import java.util.Arrays;
		import java.util.Collections;
		import java.util.List;

		@@ -65,34 +65,6 @@ import java.util.List;
		* Implementation of the ITelecom interface.
		*/
		public class TelecomServiceImpl {
		public interface DefaultDialerManagerAdapter {
		String getDefaultDialerApplication(Context context);
		String getDefaultDialerApplication(Context context, int userId);
		boolean setDefaultDialerApplication(Context context, String packageName);
		boolean isDefaultOrSystemDialer(Context context, String packageName);
		}

		static class DefaultDialerManagerAdapterImpl implements DefaultDialerManagerAdapter {
		@Override
		public String getDefaultDialerApplication(Context context) {
		return DefaultDialerManager.getDefaultDialerApplication(context);
		}

		@Override
		public String getDefaultDialerApplication(Context context, int userId) {
		return DefaultDialerManager.getDefaultDialerApplication(context, userId);
		}

		@Override
		public boolean setDefaultDialerApplication(Context context, String packageName) {
		return DefaultDialerManager.setDefaultDialerApplication(context, packageName);
		}

		@Override
		public boolean isDefaultOrSystemDialer(Context context, String packageName) {
		return DefaultDialerManager.isDefaultOrSystemDialer(context, packageName);
		}
		}

		public interface SubscriptionManagerAdapter {
		int getDefaultVoiceSubId();
		@@ -618,7 +590,8 @@ public class TelecomServiceImpl {
		Log.startSession("TSI.gDDP");
		final long token = Binder.clearCallingIdentity();
		try {
		return mDefaultDialerManagerAdapter.getDefaultDialerApplication(mContext);
		return mDefaultDialerCache.getDefaultDialerApplication(
		ActivityManager.getCurrentUser());
		} finally {
		Binder.restoreCallingIdentity(token);
		}
		@@ -1123,9 +1096,8 @@ public class TelecomServiceImpl {
		synchronized (mLock) {
		long token = Binder.clearCallingIdentity();
		try {
		final boolean result =
		mDefaultDialerManagerAdapter
		.setDefaultDialerApplication(mContext, packageName);
		final boolean result = mDefaultDialerCache.setDefaultDialer(
		packageName, ActivityManager.getCurrentUser());
		if (result) {
		final Intent intent =
		new Intent(TelecomManager.ACTION_DEFAULT_DIALER_CHANGED);
		@@ -1210,13 +1182,12 @@ public class TelecomServiceImpl {

		private Context mContext;
		private AppOpsManager mAppOpsManager;
		private UserManager mUserManager;
		private PackageManager mPackageManager;
		private CallsManager mCallsManager;
		private final PhoneAccountRegistrar mPhoneAccountRegistrar;
		private final CallIntentProcessor.Adapter mCallIntentProcessorAdapter;
		private final UserCallIntentProcessorFactory mUserCallIntentProcessorFactory;
		private final DefaultDialerManagerAdapter mDefaultDialerManagerAdapter;
		private final DefaultDialerCache mDefaultDialerCache;
		private final SubscriptionManagerAdapter mSubscriptionManagerAdapter;
		private final TelecomSystem.SyncRoot mLock;

		@@ -1226,20 +1197,19 @@ public class TelecomServiceImpl {
		PhoneAccountRegistrar phoneAccountRegistrar,
		CallIntentProcessor.Adapter callIntentProcessorAdapter,
		UserCallIntentProcessorFactory userCallIntentProcessorFactory,
		DefaultDialerManagerAdapter defaultDialerManagerAdapter,
		DefaultDialerCache defaultDialerCache,
		SubscriptionManagerAdapter subscriptionManagerAdapter,
		TelecomSystem.SyncRoot lock) {
		mContext = context;
		mAppOpsManager = (AppOpsManager) mContext.getSystemService(Context.APP_OPS_SERVICE);

		mUserManager = (UserManager) mContext.getSystemService(Context.USER_SERVICE);
		mPackageManager = mContext.getPackageManager();

		mCallsManager = callsManager;
		mLock = lock;
		mPhoneAccountRegistrar = phoneAccountRegistrar;
		mUserCallIntentProcessorFactory = userCallIntentProcessorFactory;
		mDefaultDialerManagerAdapter = defaultDialerManagerAdapter;
		mDefaultDialerCache = defaultDialerCache;
		mCallIntentProcessorAdapter = callIntentProcessorAdapter;
		mSubscriptionManagerAdapter = subscriptionManagerAdapter;
		}
		@@ -1468,7 +1438,8 @@ public class TelecomServiceImpl {

		private boolean isPrivilegedDialerCalling(String callingPackage) {
		mAppOpsManager.checkPackage(Binder.getCallingUid(), callingPackage);
		return mDefaultDialerManagerAdapter.isDefaultOrSystemDialer(mContext, callingPackage);
		return mDefaultDialerCache.isDefaultOrSystemDialer(
		callingPackage, Binder.getCallingUserHandle().getIdentifier());
		}

		private TelephonyManager getTelephonyManager() {